create-user: Make DAV lock directories on both mire and deleuze

[hcoop/scripts.git] / create-user

diff --git a/create-user b/create-user
index 909ded4..ff57c9d 100755 (executable)
--- a/create-user
+++ b/create-user
@@ -19,6 +19,16 @@ if test -z "$USER"; then
        exit 1
 fi
 
+#
+# Helper functions
+#
+
+# Run a command on both mire and deleuze; assumes that no escaping is
+# needed.
+function mire_and_deleuze() {
+    $*
+    ssh mire.hcoop.net $*
+}
 
 #
 # Kerberos principals
@@ -134,7 +144,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
@@ -220,15 +230,14 @@ vos syncserv deleuze
 vos syncvldb deleuze
 
 # refresh volume location cache (takes ~2hrs otherwise)
-fs checkvolumes
-ssh mire.hcoop.net fs checkvolumes
+mire_and_deleuze fs checkvolumes
 
 #
-# Files and directories on deleuze
+# Non-AFS files and directories
 #
 
 # 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
+mire_and_deleuze sudo mkdir -p /var/lock/apache2/dav/$USER
+mire_and_deleuze sudo chown $USER:www-data /var/lock/apache2/dav/$USER
+mire_and_deleuze sudo chmod ug=rwx,o= /var/lock/apache2/dav/$USER