HCoop
/
clinton
/
scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use "fs ls" as test in create-user, improve kadmin error checking
[clinton/scripts.git]
/
create-user
diff --git
a/create-user
b/create-user
index
e4fafb7
..
97acdde
100755
(executable)
--- a/
create-user
+++ b/
create-user
@@
-86,7
+86,7
@@
objectClass: posixGroup
cn: $USER
gidNumber: $ID
memberUid: $USER
cn: $USER
gidNumber: $ID
memberUid: $USER
-" | sudo ldapadd -x -D cn=admin,dc=hcoop,dc=net -y /etc/ldap.secret
+" | sudo ldapadd -x -D cn=admin,dc=hcoop,dc=net -y /etc/ldap.secret
|| true
# USER.mailfilter entry
echo "
# USER.mailfilter entry
echo "
@@
-106,7
+106,7
@@
objectClass: posixGroup
cn: $USER.mailfilter
gidNumber: $ID_MF
memberUid: $USER.mailfilter
cn: $USER.mailfilter
gidNumber: $ID_MF
memberUid: $USER.mailfilter
-" | sudo ldapadd -x -D cn=admin,dc=hcoop,dc=net -y /etc/ldap.secret
+" | sudo ldapadd -x -D cn=admin,dc=hcoop,dc=net -y /etc/ldap.secret
|| true
# USER.cgi entry
echo "
# USER.cgi entry
echo "
@@
-126,7
+126,7
@@
objectClass: posixGroup
cn: $USER.cgi
gidNumber: $ID_CGI
memberUid: $USER.cgi
cn: $USER.cgi
gidNumber: $ID_CGI
memberUid: $USER.cgi
-" | sudo ldapadd -x -D cn=admin,dc=hcoop,dc=net -y /etc/ldap.secret
+" | sudo ldapadd -x -D cn=admin,dc=hcoop,dc=net -y /etc/ldap.secret
|| true
#
#
@@
-150,9
+150,10
@@
sudo chmod 440 /etc/keytabs/cgi/$USER /etc/keytabs/mailfilter/$USER
#
# HOME VOLUME
#
# HOME VOLUME
-vos create deleuze.hcoop.net /vicepa user.$USER -maxquota 400000
+vos examine user.$USER 2>/dev/null || \
+ vos create deleuze.hcoop.net /vicepa user.$USER -maxquota 400000
mkdir -p `dirname $HOMEPATH`
mkdir -p `dirname $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
chown $USER $HOMEPATH
fs sa $HOMEPATH $USER all
fs sa $HOMEPATH system:anyuser rl
@@
-162,10
+163,11
@@
mkdir -p $HOMEPATH/logs/apache
fs sa $HOMEPATH/logs/apache $USER.cgi rlwidk
# MAIL VOLUME
fs sa $HOMEPATH/logs/apache $USER.cgi rlwidk
# MAIL VOLUME
-vos create deleuze.hcoop.net /vicepa mail.$USER -maxquota 400000
+vos examine mail.$USER 2>/dev/null || \
+ vos create deleuze.hcoop.net /vicepa mail.$USER -maxquota 400000
mkdir -p `dirname $MAILPATH`
mkdir -p `dirname $MAILPATH`
-fs mkm $MAILPATH mail.$USER
-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
fs sa $MAILPATH $USER all
fs sa $MAILPATH $USER.mailfilter all
@@
-201,8
+203,10
@@
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`
mkdir -p `dirname /afs/hcoop.net/old/user/$PATHBITS`
mkdir -p `dirname /afs/hcoop.net/old/mail/$PATHBITS`
-fs mkm /afs/hcoop.net/old/user/$PATHBITS user.$USER.backup
-fs mkm /afs/hcoop.net/old/mail/$PATHBITS mail.$USER.backup
+fs ls /afs/hcoop.net/old/user/$PATHBITS || \
+ fs mkm /afs/hcoop.net/old/user/$PATHBITS user.$USER.backup
+fs ls /afs/hcoop.net/old/mail/$PATHBITS || \
+ fs mkm /afs/hcoop.net/old/mail/$PATHBITS mail.$USER.backup
vos syncserv deleuze
vos syncvldb deleuze
vos syncserv deleuze
vos syncvldb deleuze
@@
-211,6
+215,13
@@
fs checkvolumes
#
# Finally, set password for main user's principal
# Aborting this operation is harmless. Just re-invoke cpw.
#
# Finally, set password for main user's principal
# Aborting this operation is harmless. Just re-invoke cpw.
+#
+# kadmin.local doesn't report errors properly, so we have to
+# check manually
#
#
-sudo kadmin.local -p root/admin -q "cpw $USER@HCOOP.NET"
+sudo rm -f /tmp/kadmin.out
+sudo kadmin.local -p root/admin -q "cpw $USER@HCOOP.NET" \
+ 2>&1 | tee /tmp/kadmin.out
+cat /tmp/kadmin.out | grep 'Password for .* changed'
+sudo rm -f /tmp/kadmin.out