send mail from within a pagsh so tokens are not lost

[clinton/scripts.git] / create-user

diff --git a/create-user b/create-user
index d811558..4624cce 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
@@ -197,12 +202,28 @@ if test -f $HOMEPATH/Maildir/shared-maildirs; then
             's!^(SpamAssassin  )/home/spamd!\1/var/local/lib/spamd!1' \
             $file
     fi
-    for dir in $HOMEPATH/Maildir/shared-folders/SpamAssassin/*; do
+
+# This does not yet seem to be needed, and it triggers an AFS issue,
+# so I've commented it out --mwolson.
+#
+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
-    done
+    fi
+done
+if test $NOTIFY = yes; then
+    # This is probably going overboard, but oh well
+    echo "$USER needs assistance on their shared spam dir" | \
+        pagsh -c 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
@@ -220,7 +241,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
@@ -262,3 +283,9 @@ mire_and_deleuze fs checkvolumes
 mire_and_deleuze sudo mkdir -p /var/lock/apache2/dav/$USER
 mire_and_deleuze sudo chown $USER:www-data /var/lock/apache2/dav/$USER
 mire_and_deleuze sudo chmod ug=rwx,o= /var/lock/apache2/dav/$USER
+
+#
+# Domtool integration
+#
+
+domtool-adduser $USER