X-Git-Url: https://git.hcoop.net/hcoop/scripts.git/blobdiff_plain/3a9bd77a91c7228ac90171603a9260337a9e9bfb..690258da11bac82d117793b16ec0044f72ada079:/create-user

diff --git a/create-user b/create-user
index 7ad5114..3ffa5f9 100755
--- a/create-user
+++ b/create-user
@@ -1,14 +1,14 @@
 #!/bin/bash -ex
 
 # MUST be executed:
-#  - on deleuze
+#  - on fritz
 #  - as a user with an /etc/sudoers line
-#  - member of "wheel" unix group on deleuze
+#  - member of "wheel" unix group on deleuze (FIXME: TRUE?)
 #  - while holding tickets for a user who can 'ssh -K' to mire
 #     - and is a member of "wheel" on mire
 #  - while holding tokens for a user who is:
 #     - a member of system:administrator
-#     - listed in 'bos listusers deleuze'
+#     - listed in 'bos listusers fritz'
 #  - and who has been set up with Domtool admin privileges by:
 #     - running 'domtool-adduser $USER' while holding AFS admin tokens as
 #       someone who is already a Domtool admin
@@ -41,8 +41,23 @@ fi
 # Run a command on both mire and deleuze; assumes that no escaping is
 # needed.
 function mire_and_deleuze() {
+    execute_on_deleuze $*
+    execute_on_mire $*
+}
+
+function execute_on_deleuze () {
+    ssh -K deleuze.hcoop.net $*
+}
+
+function execute_on_mire () {
+    ssh -K mire.hcoop.net $*
+}
+
+function execute_on_all_machines () {
     $*
-    ssh mire.hcoop.net $*
+    ssh -K mire.hcoop.net $*
+    ssh -K hopper.hcoop.net $*
+    ssh -K deleuze.hcoop.net $*
 }
 
 #
@@ -79,59 +94,9 @@ ID_DAEMON=`pts examine $USER.daemon | head -n1 | sed 's_.*, id: *__' | sed 's_,.
 PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$USER
 HOMEPATH=/afs/hcoop.net/user/$PATHBITS
 MAILPATH=/afs/hcoop.net/common/email/$PATHBITS
-DBPATH=/afs/hcoop.net/common/.databases/$PATHBITS
-PGDIR=$DBPATH/postgres
-MYSQLDIR=$DBPATH/mysql
-
-
-#
-# Create LDAP entries. (With the whole libnss-ptdb, I kind of
-# lost the idea of what I want to do with LDAP, but we'll 
-# see with time how well it integrates...)
-# The ID returned from AFS is important here, we want to make
-# sure those IDs match.
-#
 
-# USER entry
-echo "
-dn: uid=$USER,ou=People,dc=hcoop,dc=net
-objectClass: top
-objectClass: person
-objectClass: posixAccount
-cn: $USER
-uid: $USER
-gidNumber: $ID
-sn: $USER
-host: abulafia
-host: mire
-
-dn: cn=$USER,ou=Group,dc=hcoop,dc=net
-objectClass: top
-objectClass: posixGroup
-cn: $USER
-gidNumber: $ID
-memberUid: $USER
-" | sudo ldapadd -x -D cn=admin,dc=hcoop,dc=net -y /etc/ldap.secret || true
-
-# USER.daemon entry
-echo "
-dn: uid=$USER.daemon,ou=People,dc=hcoop,dc=net
-objectClass: top
-objectClass: person
-objectClass: posixAccount
-cn: $USER.daemon
-uid: $USER.daemon
-gidNumber: $ID_DAEMON
-sn: $USER.daemon
-
-dn: cn=$USER.daemon,ou=Group,dc=hcoop,dc=net
-objectClass: top
-objectClass: posixGroup
-cn: $USER.daemon
-gidNumber: $ID_DAEMON
-memberUid: $USER.daemon
-" | sudo ldapadd -x -D cn=admin,dc=hcoop,dc=net -y /etc/ldap.secret || true
 
+# LDAP bit excised (see git history...)
 
 #
 # Export .mailfilter and .cgi keys to a keytab file
@@ -153,6 +118,12 @@ sudo chmod 440            /etc/keytabs/user.daemon/$USER
 (cd /etc/keytabs
    sudo tar clpf - user.daemon/$USER | \
      ssh hopper.hcoop.net cd /etc/keytabs\; sudo tar xlpf -)
+(cd /etc/keytabs
+   sudo tar clpf - user.daemon/$USER | \
+     ssh deleuze.hcoop.net cd /etc/keytabs\; sudo tar xlpf -)
+(cd /etc/keytabs
+   sudo tar clpf - user.daemon/$USER | \
+     ssh navajos.hcoop.net cd /etc/keytabs\; sudo tar xlpf -)
 
 #
 # Create/mount/set-perms on user's volumes (home, mail, databases, logs)
@@ -164,7 +135,7 @@ if vos examine user.$USER.d 2>/dev/null; then
 	vos rename user.$USER.d user.$USER
 fi
 vos examine user.$USER 2>/dev/null || \
-  vos create deleuze.hcoop.net /vicepa user.$USER -maxquota 400000
+  vos create fritz.hcoop.net /vicepa user.$USER -maxquota 400000
 
 mkdir -p `dirname $HOMEPATH`
 fs ls $HOMEPATH || test -L $HOMEPATH || fs mkm $HOMEPATH user.$USER
@@ -204,7 +175,10 @@ mkdir -p $HOMEPATH/.public/.domtool
 chown $USER:nogroup $HOMEPATH/.public/.domtool
 test -e $HOMEPATH/.domtool || \
     test -L $HOMEPATH/.domtool || \
-        sudo -u $USER ln -s $HOMEPATH/.public/.domtool $HOMEPATH/.domtool
+        execute_on_deleuze sudo -u $USER ln -s $HOMEPATH/.public/.domtool $HOMEPATH/.domtool
+        # ^^ work around sudo env_reset crap without having to
+        # actually figure out how to make it work cleanly -- clinton,
+        # 2011-11-30
 
 # Gitweb hosting
 test -L /var/cache/git/$USER || \
@@ -216,7 +190,7 @@ if vos examine mail.$USER.d 2>/dev/null; then
 	vos rename mail.$USER.d mail.$USER
 fi
 vos examine mail.$USER 2>/dev/null || \
-  vos create deleuze.hcoop.net /vicepa mail.$USER -maxquota 400000
+  vos create fritz.hcoop.net /vicepa mail.$USER -maxquota 400000
 
 mkdir -p `dirname $MAILPATH`
 fs ls $MAILPATH || fs mkm $MAILPATH         mail.$USER
@@ -251,34 +225,8 @@ else
         $HOMEPATH/Maildir
 fi
 
-# DATABASE VOLUME
-if ! vos examine db.$USER >/dev/null 2>/dev/null; then
-  mkdir -p `dirname /afs/.hcoop.net/common/.databases/$PATHBITS`
-  vos create -server afs -partition a -name db.$USER -maxquota 400000
-  fs mkmount -dir /afs/.hcoop.net/common/.databases/$PATHBITS -vol db.$USER -rw
-  fs sa -dir $DBPATH -acl system:postgres l
-  fs sa -dir $DBPATH -acl system:mysql    l
-  fs sa -dir $DBPATH -acl system:backup   rl
-  fs sa -dir $DBPATH -acl $USER           rl
-fi
-
-# Create postgres user and tablespace placeholder within volume
-if ! test -d $PGDIR; then
-  mkdir -p $PGDIR
-  chown postgres:postgres $PGDIR
-  fs sa -dir $PGDIR -acl system:postgres write
-  fs sa -dir $PGDIR -acl $USER           none
-
- sudo -u postgres psql -c "CREATE TABLESPACE user_$USER OWNER postgres LOCATION '$PGDIR'" template1
-fi
-
-# Create mysql user and databases placeholder within volume
-mkdir -p $MYSQLDIR
-chown mysql:mysql $MYSQLDIR
-fs sa -dir $MYSQLDIR -acl system:mysql  write
-fs sa -dir $MYSQLDIR -acl $USER         none
-
-vos release common.databases
+# Create database tablespaces
+sudo /afs/hcoop.net/common/etc/scripts/create-user-database $USER
 
 #
 # Mount points for backup volumes
@@ -293,11 +241,11 @@ fs ls /afs/hcoop.net/.old/mail/$PATHBITS || \
 vos release old
 
 # technically this might not be necessary, but for good measure...
-vos syncserv deleuze
-vos syncvldb deleuze
+vos syncserv fritz
+vos syncvldb fritz
 
 # refresh volume location cache (takes ~2hrs otherwise)
-mire_and_deleuze fs checkvolumes
+execute_on_all_machines fs checkvolumes
 
 #
 # Non-AFS files and directories
@@ -313,10 +261,10 @@ mire_and_deleuze sudo chmod ug=rwx,o= /var/lock/apache2/dav/$USER
 # Domtool integration
 #
 
-domtool-adduser $USER
+execute_on_deleuze domtool-adduser $USER
 
 #
 # Subscribe user to our mailing lists.
 #
-echo $USER@hcoop.net | sudo -u list \
+echo $USER@hcoop.net | execute_on_deleuze sudo -u list \
     /var/lib/mailman/bin/add_members -r - hcoop-announce