diff options
| author | Jesse Luehrs <doy@tozt.net> | 2019-03-04 22:44:01 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2019-03-04 22:44:01 -0500 |
| commit | 29b16cfc309ab74f4927834a292c03fa0af1b56b (patch) | |
| tree | c72772f7c5c1126aae3d02babe86e162cb6f8ee2 /modules/mail | |
| parent | 5f0400bdbc4f851d95f58c47bb763e9b380f22f1 (diff) | |
| download | puppet-tozt-29b16cfc309ab74f4927834a292c03fa0af1b56b.tar.gz puppet-tozt-29b16cfc309ab74f4927834a292c03fa0af1b56b.zip | |
launch mail server with the real domain name
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/files/mailu.env | 4 | ||||
| -rw-r--r-- | modules/mail/manifests/mailu.pp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/mail/files/mailu.env b/modules/mail/files/mailu.env index c976f33..62b1347 100644 --- a/modules/mail/files/mailu.env +++ b/modules/mail/files/mailu.env @@ -1,7 +1,7 @@ VERSION=1.6 SUBNET=192.168.203.0/24 -DOMAIN=new.tozt.net -HOSTNAMES=newsmtp.tozt.net +DOMAIN=tozt.net +HOSTNAMES=mail.tozt.net POSTMASTER=admin TLS_FLAVOR=letsencrypt AUTH_RATELIMIT=10/minute;1000/hour diff --git a/modules/mail/manifests/mailu.pp b/modules/mail/manifests/mailu.pp index c1a2b50..9f6d624 100644 --- a/modules/mail/manifests/mailu.pp +++ b/modules/mail/manifests/mailu.pp @@ -44,12 +44,12 @@ class mail::mailu { exec { "generate dkim keys": provider => shell, command => " - 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 + opendkim-genkey -s dkim -d tozt.net + mv dkim.private /media/persistent/dkim/tozt.net.dkim.key + mv dkim.txt /media/persistent/dkim/tozt.net.dkim.pub ", cwd => "/media/persistent", - creates => "/media/persistent/dkim/new.tozt.net.dkim.key", + creates => "/media/persistent/dkim/tozt.net.dkim.key", require => [ Class["haveged"], Package["opendkim"], |