Extend mail handling to support Maildir and .procmailrc.

1 files changed, 30 insertions, 16 deletions

diff --git a/user-init b/user-init
index 4b25eb8..42a363f 100755
--- a/user-init
+++ b/user-init
@@ -112,13 +112,6 @@ for user in $USERS; do
 		fi
 	done
 
-	mkdir -p "$HOME/mail"
-	if [ -n "$USE_MBOX" ]; then
-		touch "$HOME/mail/mbox"
-	elif [ -f "$HOME/mail/mbox" ] && [ ! -s "$HOME/mail/mbox" ]; then
-		rm -f "$HOME/mail/mbox"
-	fi
-
 	if [ -n "$NETATALK" ]; then
 		mkdir -p "$HOME/$mac"
 	fi
@@ -153,15 +146,28 @@ for user in $USERS; do
 	chmod u=rwX,go=rX "$HOME"
 
 	# Mail handling
-	chown -R "$user": "$HOME/mail"
-	chmod -R u=rw,go=,u+X "$HOME/mail"
-	if [ -f "$HOME/.mailboxlist" ]; then
-		chown "$user": "$HOME/.mailboxlist"
-		chmod 0640 "$HOME/.mailboxlist"
-	fi
-	if [ -f "$HOME/.forward" ]; then
-		chown "$user": "$HOME/.forward"
-		chmod 0640 "$HOME/.forward"
+	if [ -n "$MAILDIR" ]; then
+		mkdir -p "$HOME/Maildir/cur" "$HOME/Maildir/new" "$HOME/Maildir/tmp"
+		chown -R "$user": "$HOME/Maildir"
+		chmod -R u=rw,go=,u+X "$HOME/Maildir"
+		if [ -f "/var/mail/$user" ] && [ ! -s "/var/mail/$user" ]; then
+			rm -f "/var/mail/$user"
+		elif [ -f "/var/spool/mail/$user" ] && [ ! -s "/var/spool/mail/$user" ]; then
+			rm -f "/var/spool/mail/$user"
+		fi
+	else
+		mkdir -p "$HOME/mail"
+		if [ -n "$USE_MBOX" ]; then
+			touch "$HOME/mail/mbox"
+		elif [ -f "$HOME/mail/mbox" ] && [ ! -s "$HOME/mail/mbox" ]; then
+			rm -f "$HOME/mail/mbox"
+		fi
+		chown -R "$user": "$HOME/mail"
+		chmod -R u=rw,go=,u+X "$HOME/mail"
+		if [ -f "$HOME/.mailboxlist" ]; then
+			chown "$user": "$HOME/.mailboxlist"
+			chmod 0640 "$HOME/.mailboxlist"
+		fi
 	fi
 	if [ -f "/var/mail/$user" ]; then
 		chown "$user":mail "/var/mail/$user"
@@ -170,6 +176,14 @@ for user in $USERS; do
 		chown "$user":mail "/var/spool/mail/$user"
 		chmod ug=rw,o= "/var/spool/mail/$user"
 	fi
+	if [ -f "$HOME/.forward" ]; then
+		chown "$user": "$HOME/.forward"
+		chmod 0640 "$HOME/.forward"
+	fi
+	if [ -f "$HOME/.procmailrc" ]; then
+		chown "$user": "$HOME/.procmailrc"
+		chmod 0640 "$HOME/.procmailrc"
+	fi
 
 	# MySQL handling
 	if [ -f "$HOME/.my.cnf" ]; then