X-Git-Url: http://git.hcoop.net/clinton/scripts.git/blobdiff_plain/3ec406664e6411284c6b29452700d68e0136015a..3c4375e5bf35bcd0d5b21c37c060ec8f3b1e19f0:/create-user

diff --git a/create-user b/create-user
index a83c524..b401d00 100755
--- a/create-user
+++ b/create-user
@@ -9,6 +9,21 @@
 #  - while holding tokens for a user who is:
 #     - a member of system:administrator
 #     - listed in 'bos listusers deleuze'
+#  - 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
 
@@ -19,6 +34,27 @@ if test -z "$USER"; then
 	exit 1
 fi
 
+#
+# Helper functions
+#
+
+# Run a command on both mire and deleuze; assumes that no escaping is
+# needed.
+function mire_and_deleuze() {
+    $*
+    ssh -K mire.hcoop.net $*
+}
+
+function execute_on_fritz () {
+    ssh -K fritz.hcoop.net $*
+}
+
+function execute_on_all_machines () {
+    $*
+    ssh -K mire.hcoop.net $*
+    ssh -K hopper.hcoop.net $*
+    ssh -K fritz.hcoop.net $*
+}
 
 #
 # Kerberos principals
@@ -54,10 +90,6 @@ 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
@@ -121,74 +153,113 @@ 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 -)
 
 #
 # 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 || fs mkm $HOMEPATH user.$USER
-chown $USER $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
 
 # Apache logs
-mkdir -p $HOMEPATH/logs/apache
-fs sa    $HOMEPATH/logs/apache $USER.daemon rlwidk
+mkdir -p $HOMEPATH/.logs
+chown $USER:nogroup $HOMEPATH/.logs
+mkdir -p $HOMEPATH/.logs/apache
+chown $USER:nogroup $HOMEPATH/.logs/apache
+fs sa $HOMEPATH/.logs/apache $USER.daemon rlwidk
+mkdir -p $HOMEPATH/.logs/mail
+fs sa $HOMEPATH/.logs/mail $USER.daemon rlwidk
+chown $USER:nogroup $HOMEPATH/.logs/mail
 
 # 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
+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
+chown $USER:nogroup $HOMEPATH/.procmail.d
+fs sa $HOMEPATH/.procmail.d system:anyuser rl
+
+# .public
 mkdir -p $HOMEPATH/.public/
-fs sa $HOMEPATH/.public/ system:anyuser rl
-mkdir -p $HOMEPATH/.public/.domtool/
+chown $USER:nogroup $HOMEPATH/.public
+fs sa $HOMEPATH/.public system:anyuser rl
+
+# .domtool
+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
+        sudo -u $USER ln -s $HOMEPATH/.public/.domtool $HOMEPATH/.domtool
+
+# 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
+chown $USER:nogroup $MAILPATH
+chown $USER:nogroup $HOMEPATH/Maildir
 fs sa $MAILPATH $USER        all
 fs sa $MAILPATH $USER.daemon all
-
-# 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
+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
-
-# Create postgres user and tablespace placeholder within volume
-if ! [ -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
+chown $USER:nogroup $MAILPATH/cur $MAILPATH/new $MAILPATH/tmp
+
+# Set up shared SpamAssassin folder
+if test -f $HOMEPATH/Maildir/shared-maildirs; then
+    # Deal with case where user rsync'd their Maildir from fyodor
+    pattern='^SpamAssassin	/home/spamd'
+    file=$HOMEPATH/Maildir/shared-maildirs
+    if grep $pattern $file; then
+        sed -i -r -e \
+            's!^(SpamAssassin	)/home/spamd!\1/var/local/lib/spamd!1' \
+            $file
+    fi
+else
+    maildirmake --add SpamAssassin=/var/local/lib/spamd/Maildir \
+        $HOMEPATH/Maildir
 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
+execute_on_fritz /afs/hcoop.net/common/etc/scripts/create-user-database $USER
 
 #
 # Mount points for backup volumes
@@ -203,17 +274,30 @@ 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)
-fs checkvolumes
-ssh mire.hcoop.net fs checkvolumes
-
-# Technically this is not idempotent.  This is not *too* bad because
-# of the fact that in AFS non-system:administrators users can't change
-# the group/owner of a file anyways.  However, users still might want
-# to know which other users created certain files (in, say, a dropbox
-# or something like that).  FIMXE.
-chown -R $USER:nogroup $HOMEPATH
-chown -R $USER:nogroup $MAILPATH
+execute_on_all_machines fs checkvolumes
+
+#
+# Non-AFS files and directories
+#
+
+# 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
+
+#
+# Domtool integration
+#
+
+domtool-adduser $USER
+
+#
+# Subscribe user to our mailing lists.
+#
+echo $USER@hcoop.net | sudo -u list \
+    /var/lib/mailman/bin/add_members -r - hcoop-announce