Add uidNumber to LDAP entries

[clinton/scripts.git] / create-user

diff --git a/create-user b/create-user
index e4fafb7..ac69024 100755 (executable)
--- a/create-user
+++ b/create-user
@@ -4,6 +4,7 @@
 #  - on deleuze
 #  - as a user with an /etc/sudoers line
 #  - member of wheel unix group
+#  - while holding tickets for a user who can 'ssh -K' to mire
 #  - while holding tokens for a user who is:
 #     - a member of system:administrator
 #     - listed in 'bos listusers deleuze'
@@ -74,6 +75,7 @@ objectClass: person
 objectClass: posixAccount
 cn: $USER
 uid: $USER
+uidNumber: $ID
 gidNumber: $ID
 homeDirectory: $HOMEPATH
 sn: $USER
@@ -86,7 +88,7 @@ objectClass: posixGroup
 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 "
@@ -96,6 +98,7 @@ objectClass: person
 objectClass: posixAccount
 cn: $USER.mailfilter
 uid: $USER.mailfilter
+uidNumber: $ID_MF
 gidNumber: $ID_MF
 homeDirectory: $HOMEPATH
 sn: $USER.mailfilter
@@ -106,7 +109,7 @@ objectClass: posixGroup
 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 "
@@ -116,6 +119,7 @@ objectClass: person
 objectClass: posixAccount
 cn: $USER.cgi
 uid: $USER.cgi
+uidNumber: $ID_CGI
 gidNumber: $ID_CGI
 homeDirectory: $HOMEPATH
 sn: $USER.cgi
@@ -126,7 +130,7 @@ objectClass: posixGroup
 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
 
 
 #
@@ -135,6 +139,7 @@ memberUid: $USER.cgi
 
 # create a mailfilter keytab (used by /etc/exim4/get-token)
 sudo kadmin.local -p root/admin -q "ktadd -k /etc/keytabs/mailfilter/$USER $USER/mailfilter@HCOOP.NET"
+
 # create a cgi keytab
 sudo kadmin.local -p root/admin -q "ktadd -k /etc/keytabs/cgi/$USER $USER/cgi@HCOOP.NET"
 
@@ -143,16 +148,18 @@ sudo chown www-data:wheel /etc/keytabs/cgi/$USER
 sudo chown $USER:wheel    /etc/keytabs/mailfilter/$USER
 sudo chmod 440            /etc/keytabs/cgi/$USER /etc/keytabs/mailfilter/$USER
 
-# FIXME: rsync keytabs to mire?
+# rsync keytabs to mire
+rsync -e ssh -a /etc/keytabs/cgi/$USER mire.hcoop.net:/etc/keytabs/cgi/$USER
 
 #
 # Create/mount/set-perms on user's volumes (home, mail, databases, logs)
 #
 
 # 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`
-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
@@ -161,11 +168,18 @@ fs sa $HOMEPATH system:anyuser   rl
 mkdir -p $HOMEPATH/logs/apache
 fs sa    $HOMEPATH/logs/apache $USER.cgi rlwidk
 
+# public_html
+mkdir -p $HOMEPATH/public_html/
+fs sa $HOMEPATH/public_html system:anyuser rl
+mkdir -p $HOMEPATH/.procmail.d/
+fs sa $HOMEPATH/.procmail.d/ system:anyuser rl
+
 # 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`
-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
 
@@ -201,16 +215,29 @@ 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`
-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
 
+# technically this might not be necessary, but for good measure...
 vos syncserv deleuze
 vos syncvldb deleuze
+
+# refresh volume location cache (takes ~2hrs otherwise)
 fs checkvolumes
+ssh mire.hcoop.net fs checkvolumes
 
 #
 # 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