cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-07-18 02:51:47 -04:00
parent 9a31b95e7d
commit 8aabde7a3a
Failed to extract signature
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -409,8 +409,16 @@ kiteMailServer = propertyList "kitenet.net mail server"
`onChange` Service.restarted "spamass-milter" `onChange` Service.restarted "spamass-milter"
`describe` "spamass-milter configured" `describe` "spamass-milter configured"
, Apt.serviceInstalledRunning "clamav-freshclam"
, Apt.serviceInstalledRunning "amavisd-milter" , 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"] , Apt.installed ["maildrop"]
, "/etc/maildroprc" `File.hasContent` , "/etc/maildroprc" `File.hasContent`
@ -472,8 +480,8 @@ kiteMailServer = propertyList "kitenet.net mail server"
, "# Enable postgrey." , "# Enable postgrey."
, "smtpd_recipient_restrictions = permit_mynetworks,reject_unauth_destination,check_policy_service inet:127.0.0.1:10023" , "smtpd_recipient_restrictions = permit_mynetworks,reject_unauth_destination,check_policy_service inet:127.0.0.1:10023"
, "# Enable spamass-milter." , "# Enable spamass-milter and amavis-milter."
, "smtpd_milters = unix:/spamass/spamass.sock" , "smtpd_milters = unix:/spamass/spamass.sock unix:amavis/amavis.sock"
, "milter_connect_macros = j {daemon_name} v {if_name} _" , "milter_connect_macros = j {daemon_name} v {if_name} _"
, "# TLS setup -- server" , "# TLS setup -- server"