diff options
| author | Jesse Luehrs <doy@tozt.net> | 2018-10-25 02:22:31 -0400 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2018-10-25 02:22:31 -0400 |
| commit | 3ecf0fa69713f67707628cc87784748c3f930410 (patch) | |
| tree | 6d8576d52fcaa982099132a46be57b36c9da972b /mail | |
| parent | a1b890f74d7c889a1e26fbfe7f30c61a83445f90 (diff) | |
| download | puppet-tozt-3ecf0fa69713f67707628cc87784748c3f930410.tar.gz puppet-tozt-3ecf0fa69713f67707628cc87784748c3f930410.zip | |
allow use of subdomains with dkim
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mail/files/dkim_signing.conf | 1 | ||||
| -rw-r--r-- | mail/mail/manifests/mailu.pp | 17 |
2 files changed, 14 insertions, 4 deletions
diff --git a/mail/mail/files/dkim_signing.conf b/mail/mail/files/dkim_signing.conf new file mode 100644 index 0000000..b1ddead --- /dev/null +++ b/mail/mail/files/dkim_signing.conf @@ -0,0 +1 @@ +use_esld = false; diff --git a/mail/mail/manifests/mailu.pp b/mail/mail/manifests/mailu.pp index ef48876..46a8df7 100644 --- a/mail/mail/manifests/mailu.pp +++ b/mail/mail/manifests/mailu.pp @@ -25,6 +25,15 @@ class mail::mailu { "/mailu/certs/dhparam.pem": source => "puppet:///modules/mail/dhparam.pem", require => File["/mailu/certs"]; + "/mailu/overrides": + ensure => directory, + require => Class["mail::persistent"]; + "/mailu/overrides/rspamd": + ensure => directory, + require => File["/mailu/overrides"]; + "/mailu/overrides/rspamd/dkim_signing.conf": + source => "puppet:///modules/mail/dkim_signing.conf", + require => File["/mailu/overrides/rspamd"]; } exec { "generate mailu secret key": @@ -42,12 +51,12 @@ class mail::mailu { exec { "generate dkim keys": provider => shell, command => " - opendkim-genkey -s dkim -d tozt.net - mv dkim.private /mailu/dkim/tozt.net.dkim.key - mv dkim.txt /mailu/dkim/tozt.net.dkim.pub + opendkim-genkey -s dkim -d new2.tozt.net + mv dkim.private /mailu/dkim/new2.tozt.net.dkim.key + mv dkim.txt /mailu/dkim/new2.tozt.net.dkim.pub ", cwd => "/mailu", - creates => "/mailu/dkim/tozt.net.dkim.key", + creates => "/mailu/dkim/new2.tozt.net.dkim.key", require => [ Package["haveged"], Package["opendkim-tools"], |