From: megacz <megacz>
Date: Tue, 1 May 2007 03:33:08 +0000 (+0000)
Subject: use "fs ls" as test in create-user, improve kadmin error checking
X-Git-Url: http://git.hcoop.net/clinton/scripts.git/commitdiff_plain/ef64fd5f806bb6da6da699c4f8ddb3a50498752c?ds=sidebyside

use "fs ls" as test in create-user, improve kadmin error checking
---

diff --git a/create-user b/create-user
index 2c4e33a..97acdde 100755
--- a/create-user
+++ b/create-user
@@ -153,7 +153,7 @@ sudo chmod 440            /etc/keytabs/cgi/$USER /etc/keytabs/mailfilter/$USER
 vos examine user.$USER 2>/dev/null || \
   vos create deleuze.hcoop.net /vicepa user.$USER -maxquota 400000
 mkdir -p `dirname $HOMEPATH`
-test -e $HOMEPATH || fs mkm $HOMEPATH user.$USER
+fs ls $HOMEPATH || fs mkm $HOMEPATH user.$USER
 chown $USER $HOMEPATH
 fs sa $HOMEPATH $USER            all
 fs sa $HOMEPATH system:anyuser   rl
@@ -166,8 +166,8 @@ fs sa    $HOMEPATH/logs/apache $USER.cgi rlwidk
 vos examine mail.$USER 2>/dev/null || \
   vos create deleuze.hcoop.net /vicepa mail.$USER -maxquota 400000
 mkdir -p `dirname $MAILPATH`
-test -e $MAILPATH || fs mkm $MAILPATH         mail.$USER
-test -e $HOMEPATH/Maildir || fs mkm $HOMEPATH/Maildir mail.$USER
+fs ls $MAILPATH || fs mkm $MAILPATH         mail.$USER
+fs ls $HOMEPATH/Maildir || fs mkm $HOMEPATH/Maildir mail.$USER
 fs sa $MAILPATH $USER            all
 fs sa $MAILPATH $USER.mailfilter all
 
@@ -203,9 +203,9 @@ fs sa -dir $MYSQLDIR -acl system:mysql  write
 
 mkdir -p `dirname /afs/hcoop.net/old/user/$PATHBITS`
 mkdir -p `dirname /afs/hcoop.net/old/mail/$PATHBITS`
-test -e /afs/hcoop.net/old/user/$PATHBITS || \
+fs ls /afs/hcoop.net/old/user/$PATHBITS || \
   fs mkm /afs/hcoop.net/old/user/$PATHBITS user.$USER.backup
-test -e /afs/hcoop.net/old/mail/$PATHBITS || \
+fs ls /afs/hcoop.net/old/mail/$PATHBITS || \
   fs mkm /afs/hcoop.net/old/mail/$PATHBITS mail.$USER.backup
 
 vos syncserv deleuze
@@ -219,7 +219,9 @@ fs checkvolumes
 # kadmin.local doesn't report errors properly, so we have to
 # check manually
 # 
+sudo rm -f /tmp/kadmin.out
 sudo kadmin.local -p root/admin -q "cpw $USER@HCOOP.NET" \
-  2>&1 | grep 'Password for .* changed' || \
-  (echo "*** kadmin.local -q cpw failed!"; exit -1)
+  2>&1 | tee /tmp/kadmin.out
+cat /tmp/kadmin.out | grep 'Password for .* changed'
+sudo rm -f /tmp/kadmin.out