Change MySQL script to follow multi-level directory scheme

[hcoop/domtool2.git] / src / plugins / domtool-mysql

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index 657ed00..c7aac5f 100755 (executable)
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 case $1 in
        adduser)
@@ -6,6 +6,7 @@ case $1 in
                PASSWORD=$3
 
                sudo -H mysql -e "CREATE USER '$USERNAME'@'localhost' IDENTIFIED BY '$PASSWORD';"
+       ;;
 
        passwd)
                USERNAME=$2
@@ -13,16 +14,17 @@ case $1 in
 
                sudo -H mysql -e "SET PASSWORD FOR '$USERNAME'@'localhost' = PASSWORD('$PASSWORD');"
        ;;
+
        createdb)
                USERNAME=$2
                DBNAME_BASE=$3
                DBNAME="${USERNAME}_${DBNAME_BASE}"
-               DIR=/afs/hcoop.net/common/databases/$USERNAME/mysql
+               DIR=/afs/hcoop.net/common/databases/${USERNAME:0:1}/${USERNAME:0:2}/$USERNAME/mysql
 
                kinit -k -t /etc/keytabs/root.admin.keytab root/admin
                aklog
 
-               if ! -d $DIR; then
+               if [ ! -d $DIR ]; then
                        echo WARNING: $DIR must already exist!
                fi