summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-07-17 21:35:43 -0400
committerJoey Hess2014-07-17 21:35:43 -0400
commite242c68de7762b3e13548bdd6547873aba511baa (patch)
treead657f6de6a06ff2bafc36873e7ead8b0daff728 /src/Propellor
parentec6a89c5fecfb272556ca65cd823cb3069ebcf3d (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 713b2aab..eaed66b1 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -400,7 +400,7 @@ kiteMailServer = propertyList "kitenet.net mail server"
, Apt.installed ["maildrop"]
, "/etc/aliases" `File.hasPrivContentExposed` ctx
`onChange` cmdProperty "newaliases" ["newaliases"]
- , "/etc/ssl/certs/joeyca.pem" `File.hasPrivContentExposed` ctx
+ , hasJoeyCAChain
, "/etc/ssl/certs/postfix.pem" `File.hasPrivContentExposed` ctx
, "/etc/ssl/private/postfix.pem" `File.hasPrivContent` ctx
, "/etc/postfix/mydomain" `File.containsLines`
@@ -468,3 +468,7 @@ kiteMailServer = propertyList "kitenet.net mail server"
]
where
ctx = Context "kitenet.net"
+
+hasJoeyCAChain :: Property
+hasJoeyCAChain = "/etc/ssl/certs/joeyca.pem" `File.hasPrivContentExposed`
+ Context "joeyca.pem"