summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific
diff options
context:
space:
mode:
authorJoey Hess2017-11-22 14:42:03 -0400
committerJoey Hess2017-11-22 14:42:03 -0400
commit1ba03e425ca48aa9d9c32861681c9e5b70abe881 (patch)
tree2f162520589c649978a9986e8cce9e2e39c0e96c /src/Propellor/Property/SiteSpecific
parent85a6ca99ac40d521b3634af6f4f8c9f8b227a0ff (diff)
parenteebdd018cd4c3054c258eeb7a6b304b263d62a74 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 15d21eae..6965af76 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -595,19 +595,16 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
[ "#!/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 \"$@\""
+ , "exec alpine \"$@\""
]
`onChange` (pinescript `File.mode`
combineModes (readModes ++ executeModes))
`describe` "pine wrapper script"
+ -- Make pine use dovecot pipe to read maildir.
& "/etc/pine.conf" `File.hasContent`
[ "# deployed with propellor"
- , "inbox-path={localhost/novalidate-cert/NoRsh}inbox"
+ , "inbox-path={localhost}inbox"
+ , "rsh-command=/usr/lib/dovecot/imap"
]
`describe` "pine configured to use local imap server"