diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-18 00:36:21 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-18 00:36:21 -0400 |
| commit | fddcf13973f46377ebf68b58eaa3cda66f8bdbc8 (patch) | |
| tree | 71c6684a9b1ee86c439a7b92584337a3dbe77913 /src | |
| parent | 5590c1c75a4207ab5ad3d02a2073f974b0b27add (diff) | |
propellor spin
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 80287686..a42349d6 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -389,6 +389,7 @@ kiteMailServer = propertyList "kitenet.net mail server" [ Postfix.installed , Apt.installed ["postfix-pcre"] , Apt.serviceInstalledRunning "postgrey" + , Apt.serviceInstalledRunning "spamassassin" , "/etc/default/spamassassin" `File.containsLines` [ "ENABLED=1" @@ -397,13 +398,35 @@ kiteMailServer = propertyList "kitenet.net mail server" , "NICE=\"--nicelevel 15\"" ] `onChange` Service.restarted "spamassassin" `describe` "spamd enabled" + , Apt.serviceInstalledRunning "spamass-milter" + -- Add -m to prevent modifying messages Subject or body. + , "/etc/default/spamass-milter" `File.containsLine` + "OPTIONS=\"-m -u spamass-milter -i 127.0.0.1\"" + `onChange` Service.restarted "spamass-milter" + `describe` "spamass-milter configured" + , Apt.installed ["maildrop"] + , "/etc/maildroprc" `File.hasContent` + [ "# Global maildrop filter file (deployed with propellor" + , "DEFAULT=\"$HOME/Maildir\"" + , "MAILBOX=\"$DEFAULT/.\"" + , "# Filter spam to a spam folder, unless .keepspam exists" + , "if (/^X-Spam-Status: Yes/)" + , "{" + , " `test -e \"$HOME/.keepspam\"`" + , " if ( $RETURNCODE != 0 )" + , " to ${MAILBOX}spam" + , "}" + ] + `describe` "maildrop configured" + , "/etc/aliases" `File.hasPrivContentExposed` ctx `onChange` cmdProperty "newaliases" ["newaliases"] , hasJoeyCAChain , "/etc/ssl/certs/postfix.pem" `File.hasPrivContentExposed` ctx , "/etc/ssl/private/postfix.pem" `File.hasPrivContent` ctx + , "/etc/postfix/mydomain" `File.containsLines` [ "/.*\\.kitenet\\.net/\tOK" , "/mooix\\.net/\tOK" @@ -468,8 +491,10 @@ kiteMailServer = propertyList "kitenet.net mail server" `onChange` Postfix.dedupMainCf `onChange` Service.restarted "postfix" `describe` "postfix configured" + , Apt.serviceInstalledRunning "dovecot-imapd" , Apt.serviceInstalledRunning "dovecot-pop3d" + , Apt.serviceInstalledRunning "cron" , Apt.installed ["bsd-mailx"] ] |