X-Git-Url: https://git.hcoop.net/hcoop/scripts.git/blobdiff_plain/527edd8e1a3357f477110491e35733e064c3630f..24222a38e29a6beb9423c53fed6c5ee51ba5aa01:/create-user

diff --git a/create-user b/create-user
index 6474841..f71edfa 100755
--- a/create-user
+++ b/create-user
@@ -1,14 +1,29 @@
 #!/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
+#     - running 'domtool-admin grant $USER priv all' as someone who is already a
+#       Domtool admin
+#       (To bootstrap yourself into admindom:
+#         1. Run '/etc/init.d/domtool-server stop' on deleuze.
+#         2. Run '/etc/init.d/domtool-slave stop' on all Domtool slave machines
+#            (e.g., mire).
+#         3. Edit ~domtool/acl, following the example of adamc_admin to grant
+#             yourself 'priv all'.
+#         4. Run '/etc/init.d/domtool-server start' on deleuze.
+#         5. Run '/etc/init.d/domtool-slave start' on all Domtool slave
+#            machines.
+#         6. Run 'domtool-adduser' as above.)
 
 USER=$1
 
@@ -25,9 +40,27 @@ fi
 
 # Run a command on both mire and deleuze; assumes that no escaping is
 # needed.
-function mire_and_deleuze() {
+
+
+function execute_on_web_nodes() {
+    ssh -K deleuze $*
+    ssh -K mire $*
+    ssh -K navajos $*
+}
+
+# change to execute_on_domtool_server
+function execute_on_domtool_server () {
+    ssh -K deleuze.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 $*
+    ssh -K navajos.hcoop.net $*
+    ssh -K bog.hcoop.net $*
 }
 
 #
@@ -64,59 +97,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
@@ -131,23 +114,43 @@ test -e /etc/keytabs/user.daemon/$USER || \
 sudo chown $USER:www-data /etc/keytabs/user.daemon/$USER
 sudo chmod 440            /etc/keytabs/user.daemon/$USER
 
-# rsync keytabs to mire
+# rsync keytabs
 (cd /etc/keytabs
    sudo tar clpf - user.daemon/$USER | \
      ssh mire.hcoop.net cd /etc/keytabs\; sudo tar xlpf -)
+(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 -)
+(cd /etc/keytabs
+   sudo tar clpf - user.daemon/$USER | \
+     ssh bog.hcoop.net cd /etc/keytabs\; sudo tar xlpf -)
 
 #
 # Create/mount/set-perms on user's volumes (home, mail, databases, logs)
 #
 
 # HOME VOLUME
+if vos examine user.$USER.d 2>/dev/null; then
+	echo "Reactivating old volume (user.$USER.d)"
+	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
 chown $USER:nogroup $HOMEPATH
 fs sa $HOMEPATH $USER            all
 fs sa $HOMEPATH system:anyuser   l
+# cleanliness / needed to keep suphp happy
+chown root:root $HOMEPATH/../../
+chown root:root $HOMEPATH/../
 
 # Apache logs
 mkdir -p $HOMEPATH/.logs
@@ -160,9 +163,11 @@ fs sa $HOMEPATH/.logs/mail $USER.daemon rlwidk
 chown $USER:nogroup $HOMEPATH/.logs/mail
 
 # public_html
-mkdir -p $HOMEPATH/public_html
-chown $USER:nogroup $HOMEPATH/public_html
-fs sa $HOMEPATH/public_html system:anyuser rl
+test -e $HOMEPATH/public_html || \
+ (mkdir -p $HOMEPATH/public_html; \
+  chown $USER:nogroup $HOMEPATH/public_html; \
+  fs sa $HOMEPATH/public_html system:anyuser none; \
+  fs sa $HOMEPATH/public_html $USER.daemon rl)
 
 # .procmail.d
 mkdir -p $HOMEPATH/.procmail.d
@@ -179,11 +184,23 @@ mkdir -p $HOMEPATH/.public/.domtool
 chown $USER:nogroup $HOMEPATH/.public/.domtool
 test -e $HOMEPATH/.domtool || \
     test -L $HOMEPATH/.domtool || \
-        ln -s $HOMEPATH/.public/.domtool $HOMEPATH/.domtool
+        execute_on_domtool_server 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 || \
+    sudo ln -s $HOMEPATH/.hcoop-git /var/cache/git/$USER
 
 # MAIL VOLUME
+if vos examine mail.$USER.d 2>/dev/null; then
+	echo "Reactivating old volume (mail.$USER.d)"
+	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
 fs ls $HOMEPATH/Maildir || fs mkm $HOMEPATH/Maildir mail.$USER
@@ -191,6 +208,16 @@ chown $USER:nogroup $MAILPATH
 chown $USER:nogroup $HOMEPATH/Maildir
 fs sa $MAILPATH $USER        all
 fs sa $MAILPATH $USER.daemon all
+if test ! -e $MAILPATH/new; then
+    mkdir -p $MAILPATH/cur $MAILPATH/new $MAILPATH/tmp
+    echo -e "This email account is provided as a service for HCoop members." \
+        "\n\nTo learn how to use it, please visit the page" \
+        "\n<http://wiki.hcoop.net/MemberManual/Email> on our website."| \
+        mail -s "Welcome to your HCoop email store" \
+            -e -a "From: postmaster@hcoop.net" \
+            real-$USER
+fi
+chown $USER:nogroup $MAILPATH/cur $MAILPATH/new $MAILPATH/tmp
 
 # Set up shared SpamAssassin folder
 if test -f $HOMEPATH/Maildir/shared-maildirs; then
@@ -202,58 +229,13 @@ if test -f $HOMEPATH/Maildir/shared-maildirs; then
             's!^(SpamAssassin	)/home/spamd!\1/var/local/lib/spamd!1' \
             $file
     fi
-
-# This does not yet seem to be needed, and it triggers an AFS issue,
-# so I've commented it out --mwolson.
-#
-NOTIFY=no
-for dir in $HOMEPATH/Maildir/shared-folders/SpamAssassin/*; do
-    if ! test -d $dir; then
-        NOTIFY=yes
-    else
-        dest=/var/local/lib/spamd/Maildir/.$(basename $dir)
-        if test "$(readlink $dir/shared)" != "$dest"; then
-            ln -sf $dest $dir/shared
-        fi
-    fi
-done
-if test $NOTIFY = yes; then
-    # This is probably going overboard, but oh well
-    echo "$USER needs assistance on their shared spam dir" | \
-        mail -s "[create-user] $USER needs assistance" \
-          -e -a "From: admins@deleuze.hcoop.net" mwolson_admin
-fi
-
 else
     maildirmake --add SpamAssassin=/var/local/lib/spamd/Maildir \
         $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
-  vos release common.databases
-  fs sa -dir $DBPATH -acl system:postgres l
-  fs sa -dir $DBPATH -acl system:mysql    l
-  fs sa -dir $DBPATH -acl system:backup   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
-
- 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
-
+# Create database tablespaces
+sudo /afs/hcoop.net/common/etc/scripts/create-user-database $USER
 
 #
 # Mount points for backup volumes
@@ -268,11 +250,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
@@ -280,12 +262,18 @@ mire_and_deleuze fs checkvolumes
 
 # Make per-user apache DAV lock directory -- the directory must be
 # both user and group-writable, which is silly.
-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
+execute_on_web_nodes sudo mkdir -p /var/lock/apache2/dav/$USER
+execute_on_web_nodes sudo chown $USER:www-data /var/lock/apache2/dav/$USER
+execute_on_web_nodes sudo chmod ug=rwx,o= /var/lock/apache2/dav/$USER
 
 #
 # Domtool integration
 #
 
-domtool-adduser $USER
+execute_on_domtool_server domtool-adduser $USER
+
+#
+# Subscribe user to our mailing lists.
+#
+echo $USER@hcoop.net | ssh -K deleuze sudo -u list \
+    /var/lib/mailman/bin/add_members -r - hcoop-announce