diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-18 02:51:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-18 02:51:47 -0400 |
| commit | 8aabde7a3a4eef37a9d74a0fc75f4e244912ae01 (patch) | |
| tree | 3313c27be58cbe39b0523a37c20ae8a550f382de /src | |
| parent | 9a31b95e7d530717f2eef28b5c5f4377ad73d390 (diff) | |
propellor spin
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index f5447c2a..a1a5ca6d 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -409,8 +409,16 @@ kiteMailServer = propertyList "kitenet.net mail server" `onChange` Service.restarted "spamass-milter" `describe` "spamass-milter configured" - , Apt.serviceInstalledRunning "clamav-freshclam" , Apt.serviceInstalledRunning "amavisd-milter" + , "/etc/default/amavisd-milter" `File.containsLines` + [ "# Propellor deployed" + , "MILTERSOCKET=/var/spool/postfix/amavis/amavis.sock" + , "MILTERSOCKETOWNER=\"postfix:postfix\"" + , "MILTERSOCKETMODE=\"0660\"" + ] + `onChange` Service.restarted "amavisd-milter" + `describe` "amavisd-milter configured for postfix" + , Apt.serviceInstalledRunning "clamav-freshclam" , Apt.installed ["maildrop"] , "/etc/maildroprc" `File.hasContent` @@ -472,8 +480,8 @@ kiteMailServer = propertyList "kitenet.net mail server" , "# Enable postgrey." , "smtpd_recipient_restrictions = permit_mynetworks,reject_unauth_destination,check_policy_service inet:127.0.0.1:10023" - , "# Enable spamass-milter." - , "smtpd_milters = unix:/spamass/spamass.sock" + , "# Enable spamass-milter and amavis-milter." + , "smtpd_milters = unix:/spamass/spamass.sock unix:amavis/amavis.sock" , "milter_connect_macros = j {daemon_name} v {if_name} _" , "# TLS setup -- server" |