summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific
diff options
context:
space:
mode:
authorJoey Hess2016-03-30 22:20:01 -0400
committerJoey Hess2016-03-30 22:20:01 -0400
commit3eb5876d8810cc55f105ce564b4192ef52b8102d (patch)
treea7ab9e771d8e1bd49f54f5bbfbf61d2a9bc6df04 /src/Propellor/Property/SiteSpecific
parent947e73a2021fcad36a806a224f171e0dba9ee7da (diff)
Revert "propellor spin"
This reverts commit 947e73a2021fcad36a806a224f171e0dba9ee7da. When I tried to use startssl cert with postfix, darkstar complained: Server certificate not verified
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index d2bd70fe..a6cb3794 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -558,7 +558,7 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
& "/etc/aliases" `File.hasPrivContentExposed` ctx
`onChange` Postfix.newaliases
- & hasStartSslCAChain
+ & hasJoeyCAChain
& hasPostfixCert ctx
& "/etc/postfix/mydomain" `File.containsLines`
@@ -622,7 +622,7 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
, "milter_default_action = accept"
, "# TLS setup -- server"
- , "smtpd_tls_CAfile = /etc/ssl/certs/startssl.pem"
+ , "smtpd_tls_CAfile = /etc/ssl/certs/joeyca.pem"
, "smtpd_tls_cert_file = /etc/ssl/certs/postfix.pem"
, "smtpd_tls_key_file = /etc/ssl/private/postfix.pem"
, "smtpd_tls_loglevel = 1"
@@ -632,7 +632,7 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
, "smtpd_tls_session_cache_database = sdbm:/etc/postfix/smtpd_scache"
, "# TLS setup -- client"
- , "smtp_tls_CAfile = /etc/ssl/certs/startssl.pem"
+ , "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"
, "smtp_tls_loglevel = 1"
@@ -751,10 +751,6 @@ hasJoeyCAChain :: Property (HasInfo + UnixLike)
hasJoeyCAChain = "/etc/ssl/certs/joeyca.pem" `File.hasPrivContentExposed`
Context "joeyca.pem"
-hasStartSslCAChain :: Property (HasInfo + UnixLike)
-hasStartSslCAChain = "/etc/ssl/certs/startssl.pem" `File.hasPrivContentExposed`
- Context "startssl.pem"
-
hasPostfixCert :: Context -> Property (HasInfo + UnixLike)
hasPostfixCert ctx = combineProperties "postfix tls cert installed" $ props
& "/etc/ssl/certs/postfix.pem" `File.hasPrivContentExposed` ctx