From e242c68de7762b3e13548bdd6547873aba511baa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Jul 2014 21:35:43 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/Propellor') 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" -- cgit v1.2.3