summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-07-18 15:58:05 -0400
committerJoey Hess2014-07-18 15:58:05 -0400
commitfd7d6907b82b0505584ff174ecee98d7e3d68493 (patch)
treed15f2fae01a87ef071f21f6b05561f320380a15c /src
parentef472be6a6e1270245ec50554d6d59c31e1e733d (diff)
propellor spin
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs25
1 files changed, 24 insertions, 1 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 14cae614..52706d7e 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -508,11 +508,34 @@ kiteMailServer = propertyList "kitenet.net mail server"
, Apt.serviceInstalledRunning "dovecot-imapd"
, Apt.serviceInstalledRunning "dovecot-pop3d"
+ , "/etc/dovecot/conf.d/10-mail.conf" `File.containsLine`
+ "mail_location = maildir:~/Maildir"
+ `onChange` Service.reloaded "dovecot"
+ `describe` "dovecot configured"
- , Apt.installed ["bsd-mailx"]
+ , Apt.installed ["mutt", "bsd-mailx", "alpine"]
+
+ , pinescript `File.hasContent`
+ [ "#!/bin/sh"
+ , "# deployed with propellor"
+ , "set -e"
+ , "pass=$HOME/.pine-password"
+ , "if [ ! -e $pass ]; then"
+ , "\ttouch $pass"
+ , "fi"
+ , "chmod 600 pass"
+ , "exec alpine -passfile $pass \"$@\""
+ ]
+ `onChange` (pinescript `File.mode` combineModes (readModes ++ executeModes))
+ `describe` "pine wrapper script"
+ , "/etc/pine.conf" `File.containsLines`
+ [ "inbox-path={localhost/novalidate-cert}inbox"
+ ]
+ `describe` "pine configured to use local imap server"
]
where
ctx = Context "kitenet.net"
+ pinescript = "/usr/local/bin/pine"
hasJoeyCAChain :: Property
hasJoeyCAChain = "/etc/ssl/certs/joeyca.pem" `File.hasPrivContentExposed`