From 83dbfcad559714f0e11015334f233b4c84f8f432 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 22 Nov 2017 14:36:57 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 15d21eae..ef23c1e1 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/user=NIXUSER}inbox" + , "rsh-command=/usr/lib/dovecot/imap" ] `describe` "pine configured to use local imap server" -- cgit v1.2.3