summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2015-01-08 21:17:06 -0400
committerJoey Hess2015-01-08 21:17:06 -0400
commitdd022c917bf2690bfbfc414d68c052d8176bb243 (patch)
tree595f3ebbdafa67aeaaa76f39d87b61d781667040 /src/Propellor
parent2e6a8d492429c1afcaa5be4e85c35409756f631b (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 2accfdba..92362b99 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -445,6 +445,21 @@ kiteMailServer = propertyList "kitenet.net mail server"
`describe` "amavisd-milter configured for postfix"
, 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"]
, "/etc/maildroprc" `File.hasContent`
[ "# Global maildrop filter file (deployed with propellor)"
@@ -475,7 +490,7 @@ kiteMailServer = propertyList "kitenet.net mail server"
`describe` "postfix mydomain file configured"
, "/etc/postfix/obscure_client_relay.pcre" `File.hasContent`
-- 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.
[ "/^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