summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2015-02-01 13:14:45 -0400
committerJoey Hess2015-02-01 13:14:45 -0400
commit1b7a00372b7beecb76b295af7d1ec2ead723ba9e (patch)
treed1389652990a5fd8f20391e9c81e367bb0e5891e /src
parent04611cac47ad2dbf791edd2033ae5d089ecd1f85 (diff)
propellor spin
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 34a5f02f..a63dac4e 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -514,8 +514,13 @@ 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"
+ , "smtpd_sasl_auth_enable = yes"
+ , "smtpd_sasl_security_options = noanonymous"
+ , "smtpd_sasl_local_domain = kitenet.net"
+
, "# Enable postgrey."
- , "smtpd_recipient_restrictions = permit_tls_clientcerts,permit_mynetworks,reject_unauth_destination,check_policy_service inet:127.0.0.1:10023"
+ , "smtpd_recipient_restrictions = permit_tls_clientcerts,permit_sasl_authenticated,,permit_mynetworks,reject_unauth_destination,check_policy_service inet:127.0.0.1:10023"
, "# Enable spamass-milter, amavis-milter, opendkim"
, "smtpd_milters = unix:/spamass/spamass.sock unix:amavis/amavis.sock inet:localhost:8891"