summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/JoeySites.hs
diff options
context:
space:
mode:
authorJoey Hess2018-10-27 16:03:37 -0400
committerJoey Hess2018-10-27 16:03:37 -0400
commit619c60aa620ecef09258ddcebba24a9f2e2366ba (patch)
tree6fbeab79c5eba245ed842e8f06a591ba89e52a73 /src/Propellor/Property/SiteSpecific/JoeySites.hs
parent42f20a9bddf5f2027f8ca47e4b3b7d1e96bc1ae4 (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs')
-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 9460e787..0ed7a629 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -585,10 +585,18 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
& "/etc/pine.conf" `File.hasContent`
[ "# deployed with propellor"
, "inbox-path={localhost}inbox"
- , "rsh-command=/usr/lib/dovecot/imap"
+ , "rsh-command=" ++ imapalpinescript
]
`describe` "pine configured to use local imap server"
-
+ & imapalpinescript `File.hasContent`
+ [ "#!/bin/sh"
+ , "# deployed with propellor"
+ , "set -e"
+ , "exec /usr/lib/dovecot/imap 2>/dev/null"
+ ]
+ `onChange` (imapalpinescript `File.mode`
+ combineModes (readModes ++ executeModes))
+ `describe` "imap script for pine"
& Apt.serviceInstalledRunning "mailman"
-- Override the default http url. (Only affects new lists.)
& "/etc/mailman/mm_cfg.py" `File.containsLine`
@@ -600,6 +608,7 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
where
ctx = Context "kitenet.net"
pinescript = "/usr/local/bin/pine"
+ imapalpinescript = "/usr/local/bin/imap-for-alpine"
dovecotusers = "/etc/dovecot/users"
ssmtp = Postfix.Service