* Remove the 'adduser' code which has been moved to create-user script.

  Still, leave a placeholder message.

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index fa3db41..4fad400 100755 (executable)
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -2,22 +2,7 @@
 
 case $1 in
        adduser)
-               USERNAME=$2
-               PASSWORD=$3
-
-               kinit -k -t /etc/keytabs/root.admin.keytab root/admin
-               aklog
-
-               if ! vos examine db.$USERNAME >/dev/null 2>/dev/null; then
-                       vos create -server afs -partition a -name db.$USERNAME -maxquota 5000
-                       fs mkmount -dir /afs/.hcoop.net/common/.databases/$USERNAME -vol db.$USERNAME -rw
-                       vos release common.databases
-                       fs setacl -dir /afs/hcoop.net/common/databases/$USERNAME -acl system:postgres l
-                       fs setacl -dir /afs/hcoop.net/common/databases/$USERNAME -acl system:mysql l
-                       fs setacl -dir /afs/hcoop.net/common/databases/$USERNAME -acl system:backup rl
-               fi
-
-               sudo -H mysql -e "CREATE USER '$USERNAME'@'localhost' IDENTIFIED BY '$PASSWORD';"
+               echo MySQL user was already created during create-user.
        ;;
        passwd)
                USERNAME=$2
@@ -34,9 +19,10 @@ case $1 in
                kinit -k -t /etc/keytabs/root.admin.keytab root/admin
                aklog
 
-               mkdir -p $DIR
-               fs setacl -dir $DIR -acl system:mysql rlid
-               fs setacl -dir $DIR -acl system:backup rl
+               if ! -d $DIR; then
+                       echo WARNING: $DIR must already exist!
+               fi
+
                mkdir $DIR/$DBNAME
                chown mysql:mysql $DIR/$DBNAME
                chmod 770 $DIR/$DBNAME

diff --git a/src/plugins/domtool-postgres b/src/plugins/domtool-postgres
dissimilarity index 77%
index 4f85765..cbc10e9 100755 (executable)
--- a/src/plugins/domtool-postgres
+++ b/src/plugins/domtool-postgres
@@ -1,40 +1,17 @@
-#!/bin/sh -e
-
-case $1 in
-       adduser)
-               USERNAME=$2
-               DIR=/afs/hcoop.net/common/databases/$USERNAME/postgres
-
-               kinit -k -t /etc/keytabs/root.admin.keytab root/admin
-               aklog
-
-               if ! vos examine db.$USERNAME >/dev/null 2>/dev/null; then
-                       vos create -server afs -partition a -name db.$USERNAME -maxquota 5000
-                       fs mkmount -dir /afs/.hcoop.net/common/.databases/$USERNAME -vol db.$USERNAME -rw
-                       vos release common.databases
-                       fs setacl -dir /afs/hcoop.net/common/databases/$USERNAME -acl system:postgres l
-                       fs setacl -dir /afs/hcoop.net/common/databases/$USERNAME -acl system:mysql l
-                       fs setacl -dir /afs/hcoop.net/common/databases/$USERNAME -acl system:backup rl
-               fi
-
-               if ! [ -d $DIR ]; then
-                       sudo -u postgres psql -c "CREATE USER $USERNAME" template1
-                       mkdir -p $DIR
-                       chown postgres:postgres $DIR
-                       fs setacl -dir $DIR -acl system:postgres write
-                       fs setacl -dir $DIR -acl system:backup rl
-
-                       sudo -u postgres psql -c "CREATE TABLESPACE user_$USERNAME OWNER $USERNAME LOCATION '$DIR'" template1
-               fi
-       ;;
-       createdb)
-               USERNAME=$2
-               DBNAME_BASE=$3
-               DBNAME="${USERNAME}_${DBNAME_BASE}"
-
-               sudo -u postgres createdb -O $USERNAME -D user_$USERNAME $DBNAME
-       ;;
-       *)
-               echo "Usage: domtool-postgres [adduser <user> | createdb <user> <table>]"
-       ;;
-esac
+#!/bin/sh -e
+
+case $1 in
+       adduser)
+               echo Postgres user was already created during create-user.
+       ;;
+       createdb)
+               USERNAME=$2
+               DBNAME_BASE=$3
+               DBNAME="${USERNAME}_${DBNAME_BASE}"
+
+               sudo -u postgres createdb -O $USERNAME -D user_$USERNAME $DBNAME
+       ;;
+       *)
+               echo "Usage: domtool-postgres [adduser <user> | createdb <user> <table>]"
+       ;;
+esac