X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/0008b2c946e0bd53d1ca47f9d62bb4e9a2cca6e1..4a28134805dfc5b6bef1843f5716961a1bf9954f:/create-user

diff --git a/create-user b/create-user
index ccd65e7..489e60a 100755
--- a/create-user
+++ b/create-user
@@ -175,9 +175,11 @@ fs sa $HOMEPATH/.logs/mail $USER.daemon rlwidk
 chown $USER:nogroup $HOMEPATH/.logs/mail
 
 # public_html
-mkdir -p $HOMEPATH/public_html
-chown $USER:nogroup $HOMEPATH/public_html
-fs sa $HOMEPATH/public_html system:anyuser rl
+test -e $HOMEPATH/public_html || \
+ (mkdir -p $HOMEPATH/public_html; \
+  chown $USER:nogroup $HOMEPATH/public_html; \
+  fs sa $HOMEPATH/public_html system:anyuser none; \
+  fs sa $HOMEPATH/public_html $USER.daemon rl)
 
 # .procmail.d
 mkdir -p $HOMEPATH/.procmail.d
@@ -194,11 +196,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
+    sudo ln -s $HOMEPATH/.hcoop-git /var/cache/git/$USER
 
 # MAIL VOLUME
 vos examine mail.$USER 2>/dev/null || \
@@ -210,6 +212,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://wiki.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
@@ -221,28 +233,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
@@ -253,10 +243,10 @@ if ! vos examine db.$USER >/dev/null 2>/dev/null; then
   mkdir -p `dirname /afs/.hcoop.net/common/.databases/$PATHBITS`
   vos create -server afs -partition a -name db.$USER -maxquota 400000
   fs mkmount -dir /afs/.hcoop.net/common/.databases/$PATHBITS -vol db.$USER -rw
-  vos release common.databases
   fs sa -dir $DBPATH -acl system:postgres l
   fs sa -dir $DBPATH -acl system:mysql    l
   fs sa -dir $DBPATH -acl system:backup   rl
+  fs sa -dir $DBPATH -acl $USER           rl
 fi
 
 # Create postgres user and tablespace placeholder within volume
@@ -264,6 +254,7 @@ if ! test -d $PGDIR; then
   mkdir -p $PGDIR
   chown postgres:postgres $PGDIR
   fs sa -dir $PGDIR -acl system:postgres write
+  fs sa -dir $PGDIR -acl $USER           none
 
  sudo -u postgres psql -c "CREATE TABLESPACE user_$USER OWNER postgres LOCATION '$PGDIR'" template1
 fi
@@ -272,7 +263,9 @@ fi
 mkdir -p $MYSQLDIR
 chown mysql:mysql $MYSQLDIR
 fs sa -dir $MYSQLDIR -acl system:mysql  write
+fs sa -dir $MYSQLDIR -acl $USER         none
 
+vos release common.databases
 
 #
 # Mount points for backup volumes
@@ -308,3 +301,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