From dd022c917bf2690bfbfc414d68c052d8176bb243 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 8 Jan 2015 21:17:06 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Property') 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 -- cgit v1.2.3