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

propellor spin

This commit is contained in:
Joey Hess 2015-01-08 21:17:06 -04:00
parent 2e6a8d4924
commit dd022c917b
Failed to extract signature
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,6 +445,21 @@ kiteMailServer = propertyList "kitenet.net mail server"
`describe` "amavisd-milter configured for postfix" `describe` "amavisd-milter configured for postfix"
, Apt.serviceInstalledRunning "clamav-freshclam" , Apt.serviceInstalledRunning "clamav-freshclam"
, Apt.serviceInstalledRunning "opendkim"
, propertyList "opendkim configured"
[ "/etc/default/opendkim" `File.containsLine`
"SOCKET=\"inet:8891@localhost\""
, "/etc/opendkim.conf" `File.containsLines`
[ "KeyFile /etc/mail/dkim.key"
, "SubDomains yes"
, "Domain *"
, "Selector mail"
]
, File.hasPrivContent "/etc/mail/dkim.key" ctx
, File.ownerGroup "/etc/mail/dkim.key" "opendkim" "opendkim"
]
`onChange` Service.restarted "opendkum"
, Apt.installed ["maildrop"] , Apt.installed ["maildrop"]
, "/etc/maildroprc" `File.hasContent` , "/etc/maildroprc" `File.hasContent`
[ "# Global maildrop filter file (deployed with propellor)" [ "# Global maildrop filter file (deployed with propellor)"
@ -475,7 +490,7 @@ kiteMailServer = propertyList "kitenet.net mail server"
`describe` "postfix mydomain file configured" `describe` "postfix mydomain file configured"
, "/etc/postfix/obscure_client_relay.pcre" `File.hasContent` , "/etc/postfix/obscure_client_relay.pcre" `File.hasContent`
-- Remove received lines for mails relayed from trusted -- Remove received lines for mails relayed from trusted
-- clients. These can be a privacy vilation, or trigger -- clients. These can be a privacy violation, or trigger
-- spam filters. -- spam filters.
[ "/^Received: from ([^.]+)\\.kitenet\\.net.*using TLS.*by kitenet\\.net \\(([^)]+)\\) with (E?SMTPS?A?) id ([A-F[:digit:]]+)(.*)/ IGNORE" [ "/^Received: from ([^.]+)\\.kitenet\\.net.*using TLS.*by kitenet\\.net \\(([^)]+)\\) with (E?SMTPS?A?) id ([A-F[:digit:]]+)(.*)/ IGNORE"
-- Munge local Received line for postfix running on a -- Munge local Received line for postfix running on a