New stuff.

[clinton/scripts.git] / create-user

diff --git a/create-user b/create-user
index e022b9d..489e60a 100755 (executable)
--- 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
@@ -241,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
@@ -252,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
@@ -260,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