X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/3d7737ab8c102d606426c9056cd1eeac8ac6805d..294904cca616839be4752a7405c0651837e68cba:/create-user

diff --git a/create-user b/create-user
index 9a9276a..24fe5df 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,8 +196,7 @@ 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
-test -e $HOMEPATH/.domtool && chown $USER:nogroup $HOMEPATH/.domtool
+        sudo -u $USER ln -s $HOMEPATH/.public/.domtool $HOMEPATH/.domtool
 
 # Gitweb hosting
 test -L /var/cache/git/$USER || \
@@ -215,7 +216,7 @@ 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."| \
+        "\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
@@ -242,7 +243,6 @@ 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
@@ -262,6 +262,7 @@ mkdir -p $MYSQLDIR
 chown mysql:mysql $MYSQLDIR
 fs sa -dir $MYSQLDIR -acl system:mysql  write
 
+vos release common.databases
 
 #
 # Mount points for backup volumes