X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/5a279b8a5690f83eecb424f47fb7444ffba9744e..ba4e6c35f00132eb2bef16670cc204c61a8bf7b3:/create-user

diff --git a/create-user b/create-user
index a857e66..ce6304f 100755
--- a/create-user
+++ b/create-user
@@ -194,12 +194,11 @@ mkdir -p $HOMEPATH/.public/.domtool
 chown $USER:nogroup $HOMEPATH/.public/.domtool
 test -e $HOMEPATH/.domtool || \
     test -L $HOMEPATH/.domtool || \
-        ln -s $HOMEPATH/.public/.domtool $HOMEPATH/.domtool
+        sudo -u $USER ln -s $HOMEPATH/.public/.domtool $HOMEPATH/.domtool
 
 # Gitweb hosting
-#test -L /var/cache/git/$USER || \
-#    ln -s $HOMEPATH/.hcoop-git /var/cache/git/$USER
-
+test -L /var/cache/git/$USER || \
+    sudo ln -s $HOMEPATH/.hcoop-git /var/cache/git/$USER
 
 # MAIL VOLUME
 vos examine mail.$USER 2>/dev/null || \
@@ -211,6 +210,16 @@ chown $USER:nogroup $MAILPATH
 chown $USER:nogroup $HOMEPATH/Maildir
 fs sa $MAILPATH $USER        all
 fs sa $MAILPATH $USER.daemon all
+if test ! -e $MAILPATH/new; then
+    mkdir -p $MAILPATH/cur $MAILPATH/new $MAILPATH/tmp
+    echo -e "This email account is provided as a service for HCoop members." \
+        "\n\nTo learn how to use it, please visit the page" \
+        "\n<http://wiki2.hcoop.net/MemberManual/Email> on our website."| \
+        mail -s "Welcome to your HCoop email store" \
+            -e -a "From: postmaster@hcoop.net" \
+            real-$USER
+fi
+chown $USER:nogroup $MAILPATH/cur $MAILPATH/new $MAILPATH/tmp
 
 # Set up shared SpamAssassin folder
 if test -f $HOMEPATH/Maildir/shared-maildirs; then
@@ -222,28 +231,6 @@ if test -f $HOMEPATH/Maildir/shared-maildirs; then
             's!^(SpamAssassin	)/home/spamd!\1/var/local/lib/spamd!1' \
             $file
     fi
-
-# 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
-#         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
@@ -309,3 +296,9 @@ mire_and_deleuze sudo chmod ug=rwx,o= /var/lock/apache2/dav/$USER
 #
 
 domtool-adduser $USER
+
+#
+# Subscribe user to our mailing lists.
+#
+echo $USER@hcoop.net | sudo -u list \
+    /var/lib/mailman/bin/add_members -r - hcoop-announce