Database scripts altered to support drop

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

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index c7aac5f..4f9c9ce 100755 (executable)
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -1,18 +1,20 @@
 #!/bin/bash -e
 
 #!/bin/bash -e
 

+WHERE="'%.hcoop.net'"
+

 case $1 in
        adduser)
                USERNAME=$2
                PASSWORD=$3
 
 case $1 in
        adduser)
                USERNAME=$2
                PASSWORD=$3
 

-               sudo -H mysql -e "CREATE USER '$USERNAME'@'localhost' IDENTIFIED BY '$PASSWORD';"
+               sudo -H mysql -e "CREATE USER '$USERNAME'@$WHERE IDENTIFIED BY '$PASSWORD';"

        ;;
 
        passwd)
                USERNAME=$2
                PASSWORD=$3
 
        ;;
 
        passwd)
                USERNAME=$2
                PASSWORD=$3
 

-               sudo -H mysql -e "SET PASSWORD FOR '$USERNAME'@'localhost' = PASSWORD('$PASSWORD');"
+               sudo -H mysql -e "SET PASSWORD FOR '$USERNAME'@$WHERE = PASSWORD('$PASSWORD');"

        ;;
 
        createdb)
        ;;
 
        createdb)


@@ -34,10 +36,19 @@ case $1 in
                ln -sf $DIR/$DBNAME /var/lib/mysql/$DBNAME
                fs setacl -dir $DIR/$DBNAME/ -acl system:mysql all
 
                ln -sf $DIR/$DBNAME /var/lib/mysql/$DBNAME
                fs setacl -dir $DIR/$DBNAME/ -acl system:mysql all
 

-               sudo -H mysql -e "GRANT CREATE,SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE VIEW,SHOW VIEW,GRANT OPTION ON TABLE * TO '$USERNAME'@'localhost';" $DBNAME
+               sudo -H mysql -e "GRANT CREATE,SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE VIEW,SHOW VIEW,GRANT OPTION ON TABLE * TO '$USERNAME'@$WHERE;" $DBNAME

                sudo -H mysql -e "FLUSH PRIVILEGES;"
        ;;
                sudo -H mysql -e "FLUSH PRIVILEGES;"
        ;;

+
+       dropdb)
+               USERNAME=$2
+               DBNAME_BASE=$3
+               DBNAME="${USERNAME}_${DBNAME_BASE}"
+
+               sudo -H mysql -e "DROP DATABASE $DBNAME";
+       ;;
+

        *)
        *)

-               echo "Usage: domtool-mysql [adduser <user> <password> | passwd <user> <password> | createdb <user> <table>]"
+               echo "Usage: domtool-mysql [adduser <user> <password> | passwd <user> <password> | createdb <user> <db> | dropdb <user> <db>]"

        ;;
 esac
        ;;
 esac