summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific
diff options
context:
space:
mode:
authorJoey Hess2015-12-31 12:40:42 -0400
committerJoey Hess2015-12-31 12:40:42 -0400
commitbfe8375d46e78bc6dd796ba1d0bdce577dbd123c (patch)
tree547acbf0acb730d30f088b481a2ab95b22cc75d2 /src/Propellor/Property/SiteSpecific
parent5e73aa446e46b61ebea77af5a6addaa8be517c1d (diff)
actually parse service lines
So whitespace etc changes don't matter
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 987b4187..f140404d 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -709,7 +709,8 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
-- verification via tls cert.
postfixClientRelay :: Context -> Property HasInfo
postfixClientRelay ctx = Postfix.mainCfFile `File.containsLines`
- [ "relayhost = kitenet.net"
+ -- Using smtps not smtp because more networks firewall smtp
+ [ "relayhost = kitenet.net:smtps"
, "smtp_tls_CAfile = /etc/ssl/certs/joeyca.pem"
, "smtp_tls_cert_file = /etc/ssl/certs/postfix.pem"
, "smtp_tls_key_file = /etc/ssl/private/postfix.pem"