create-user: If $HOMEPATH is a symlink, don't run fs mkm on it

[clinton/scripts.git] / create-user

diff --git a/create-user b/create-user
index b01cbc6..85dc6c3 100755 (executable)
--- a/create-user
+++ b/create-user
@@ -134,7 +134,7 @@ sudo chmod 440            /etc/keytabs/user.daemon/$USER
 vos examine user.$USER 2>/dev/null || \
   vos create deleuze.hcoop.net /vicepa user.$USER -maxquota 400000
 mkdir -p `dirname $HOMEPATH`
-fs ls $HOMEPATH || fs mkm $HOMEPATH user.$USER
+fs ls $HOMEPATH || test -L $HOMEPATH || fs mkm $HOMEPATH user.$USER
 chown $USER:nogroup $HOMEPATH
 fs sa $HOMEPATH $USER            all
 fs sa $HOMEPATH system:anyuser   l
@@ -170,9 +170,10 @@ test -e $HOMEPATH/.domtool || \
 vos examine mail.$USER 2>/dev/null || \
   vos create deleuze.hcoop.net /vicepa mail.$USER -maxquota 400000
 mkdir -p `dirname $MAILPATH`
-chown $USER:nogroup $MAILPATH
 fs ls $MAILPATH || fs mkm $MAILPATH         mail.$USER
 fs ls $HOMEPATH/Maildir || fs mkm $HOMEPATH/Maildir mail.$USER
+chown $USER:nogroup $MAILPATH
+chown $USER:nogroup $HOMEPATH/Maildir
 fs sa $MAILPATH $USER        all
 fs sa $MAILPATH $USER.daemon all
 
@@ -221,3 +222,13 @@ vos syncvldb deleuze
 # refresh volume location cache (takes ~2hrs otherwise)
 fs checkvolumes
 ssh mire.hcoop.net fs checkvolumes
+
+#
+# Files and directories on deleuze
+#
+
+# Make per-user apache DAV lock directory -- the directory must be
+# both user and group-writable, which is silly.
+sudo mkdir -p /var/lock/apache2/dav/$USER
+sudo chown $USER:www-data /var/lock/apache2/dav/$USER
+sudo chmod ug=rwx,o= /var/lock/apache2/dav/$USER