diff options
author | Jesse Luehrs <doy@tozt.net> | 2018-12-06 05:19:35 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2018-12-06 05:19:35 -0500 |
commit | 99000f520bcda5d96ae99c28acf83c26c9cc4394 (patch) | |
tree | 6a9fda2859c1b31d34029ab8f0f7f1d3dedb0c7b | |
parent | 839e453418783fb2f5718d5167aa0720a4010cd5 (diff) | |
download | puppet-tozt-99000f520bcda5d96ae99c28acf83c26c9cc4394.tar.gz puppet-tozt-99000f520bcda5d96ae99c28acf83c26c9cc4394.zip |
fix newmail hostnames a bit more
-rwxr-xr-x | bin/secrets | 2 | ||||
-rw-r--r-- | modules/mail/manifests/mailu.pp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/secrets b/bin/secrets index ea7aef8..d7a5dfd 100755 --- a/bin/secrets +++ b/bin/secrets @@ -34,7 +34,7 @@ cmd_sync() { if [ "${host}" = "tozt" ]; then hostname=tozt.net elif [ "${host}" = "mail" ]; then - hostname=newmail3.tozt.net + hostname=newsmtp.tozt.net elif [ "${host}" = "partofme" ]; then hostname=partofme else diff --git a/modules/mail/manifests/mailu.pp b/modules/mail/manifests/mailu.pp index 9c61ecb..fa1e93b 100644 --- a/modules/mail/manifests/mailu.pp +++ b/modules/mail/manifests/mailu.pp @@ -37,12 +37,12 @@ class mail::mailu { exec { "generate dkim keys": provider => shell, command => " - opendkim-genkey -s dkim -d new2.tozt.net - mv dkim.private /media/persistent/dkim/new2.tozt.net.dkim.key - mv dkim.txt /media/persistent/dkim/new2.tozt.net.dkim.pub + opendkim-genkey -s dkim -d new.tozt.net + mv dkim.private /media/persistent/dkim/new.tozt.net.dkim.key + mv dkim.txt /media/persistent/dkim/new.tozt.net.dkim.pub ", cwd => "/media/persistent", - creates => "/media/persistent/dkim/new2.tozt.net.dkim.key", + creates => "/media/persistent/dkim/new.tozt.net.dkim.key", require => [ Class["haveged"], Package["opendkim"], |