create-user: Make ~/.logs directory for everyone and a mail/ subdir

[hcoop/scripts.git] / create-user

diff --git a/create-user b/create-user
index ff57c9d..7301181 100755 (executable)
--- a/create-user
+++ b/create-user
@@ -150,9 +150,14 @@ fs sa $HOMEPATH $USER            all
 fs sa $HOMEPATH system:anyuser   l
 
 # Apache logs
-mkdir -p $HOMEPATH/logs/apache
-chown $USER:nogroup $HOMEPATH/logs/apache
-fs sa $HOMEPATH/logs/apache $USER.daemon rlwidk
+mkdir -p $HOMEPATH/.logs
+chown $USER:nogroup $HOMEPATH/.logs
+mkdir -p $HOMEPATH/.logs/apache
+chown $USER:nogroup $HOMEPATH/.logs/apache
+fs sa $HOMEPATH/.logs/apache $USER.daemon rlwidk
+mkdir -p $HOMEPATH/.logs/mail
+fs sa $HOMEPATH/.logs/mail $USER.daemon rlwidk
+chown $USER:nogroup $HOMEPATH/.logs/mail
 
 # public_html
 mkdir -p $HOMEPATH/public_html
@@ -187,6 +192,38 @@ chown $USER:nogroup $HOMEPATH/Maildir
 fs sa $MAILPATH $USER        all
 fs sa $MAILPATH $USER.daemon all
 
+# Set up shared SpamAssassin folder
+if test -f $HOMEPATH/Maildir/shared-maildirs; then
+    # Deal with case where user rsync'd their Maildir from fyodor
+    pattern='^SpamAssassin     /home/spamd'
+    file=$HOMEPATH/Maildir/shared-maildirs
+    if grep $pattern $file; then
+        sed -i -r -e \
+            's!^(SpamAssassin  )/home/spamd!\1/var/local/lib/spamd!1' \
+            $file
+    fi
+    NOTIFY=no
+    for dir in $HOMEPATH/Maildir/shared-folders/SpamAssassin/*; do
+        if ! test -d $dir; then
+            NOTIFY=yes
+        else
+            dest=/var/local/lib/spamd/Maildir/.$(basename $dir)
+            if test "$(readlink $dir/shared)" != "$dest"; then
+                ln -sf $dest $dir/shared
+            fi
+        fi
+    done
+    if test $NOTIFY = yes; then
+        # This is probably going overboard, but oh well
+        echo "$USER needs assistance on their shared spam dir" | \
+            mail -s "[create-user] $USER needs assistance" \
+              -e -a "From: admins@deleuze.hcoop.net" mwolson_admin
+    fi
+else
+    maildirmake --add SpamAssassin=/var/local/lib/spamd/Maildir \
+        $HOMEPATH/Maildir
+fi
+
 # DATABASE VOLUME
 if ! vos examine db.$USER >/dev/null 2>/dev/null; then
   mkdir -p `dirname /afs/.hcoop.net/common/.databases/$PATHBITS`
@@ -199,7 +236,7 @@ if ! vos examine db.$USER >/dev/null 2>/dev/null; then
 fi
 
 # Create postgres user and tablespace placeholder within volume
-if ! [ -d $PGDIR ]; then
+if ! test -d $PGDIR; then
   mkdir -p $PGDIR
   chown postgres:postgres $PGDIR
   fs sa -dir $PGDIR -acl system:postgres write