summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-07-18 16:40:09 -0400
committerJoey Hess2014-07-18 16:40:09 -0400
commit93730d530a722e951e51c675c1aed9fdd3c75a87 (patch)
tree789cfbad3dcf7ea5d726c136dfdd4e5d28e0159b /src
parentd5abbeb116a749c77d9d594097bd83c027374384 (diff)
propellor spin
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 1b70807a..5f647bf2 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -511,7 +511,14 @@ kiteMailServer = propertyList "kitenet.net mail server"
, "/etc/dovecot/conf.d/10-mail.conf" `File.containsLine`
"mail_location = maildir:~/Maildir"
`onChange` Service.reloaded "dovecot"
- `describe` "dovecot configured"
+ `describe` "dovecot mail.conf"
+ , "/etc/dovecot/conf.d/10-auth.conf" `File.containsLine`
+ "!include auth-passwdfile.conf.ex"
+ `onChange` Service.restarted "dovecot"
+ `describe` "dovecot auth.conf"
+ , File.hasPrivContent dovecotusers ctx
+ `onChange` (dovecotusers `File.mode`
+ combineModes [ownerReadMode, groupReadMode])
, Apt.installed ["mutt", "bsd-mailx", "alpine"]
@@ -526,7 +533,8 @@ kiteMailServer = propertyList "kitenet.net mail server"
, "chmod 600 $pass"
, "exec alpine -passfile $pass \"$@\""
]
- `onChange` (pinescript `File.mode` combineModes (readModes ++ executeModes))
+ `onChange` (pinescript `File.mode`
+ combineModes (readModes ++ executeModes))
`describe` "pine wrapper script"
, "/etc/pine.conf" `File.containsLines`
[ "inbox-path={localhost/novalidate-cert}inbox"
@@ -536,6 +544,7 @@ kiteMailServer = propertyList "kitenet.net mail server"
where
ctx = Context "kitenet.net"
pinescript = "/usr/local/bin/pine"
+ dovecotusers = "/etc/dovecot/users"
hasJoeyCAChain :: Property
hasJoeyCAChain = "/etc/ssl/certs/joeyca.pem" `File.hasPrivContentExposed`