summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/JoeySites.hs
diff options
context:
space:
mode:
authorJoey Hess2015-02-01 14:48:13 -0400
committerJoey Hess2015-02-01 14:48:13 -0400
commitbcdc5754fce030fd9a7b213d46ffd27b502f398a (patch)
treef24dfa7c89f02495c94d6fd8f9fee6a807853b82 /src/Propellor/Property/SiteSpecific/JoeySites.hs
parentf276466cf280b9ce91bbfefce35d2a27ebc87843 (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 7b6a61e4..0d4687e7 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -450,6 +450,8 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
& dkimInstalled
+ & Postfix.saslAuthdInstalled
+
& Apt.installed ["maildrop"]
& "/etc/maildroprc" `File.hasContent`
[ "# Global maildrop filter file (deployed with propellor)"
@@ -514,7 +516,7 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
, "# Filter out client relay lines from headers."
, "header_checks = pcre:$config_directory/obscure_client_relay.pcre"
- , "# Password auth for relaying"
+ , "# Password auth for relaying (used by errol)"
, "smtpd_sasl_auth_enable = yes"
, "smtpd_sasl_type = dovecot"
, "smtpd_sasl_path = private/auth"