MySQL password changing

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

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index 5873ec9..d2c5298 100755 (executable)
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -8,13 +8,21 @@ case $1 in
                kinit -k -t /etc/keytabs/root.admin.keytab root/admin
                aklog
 
-               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 databases l
-               fs setacl -dir /afs/hcoop.net/common/databases/$USERNAME -acl system:backup rl
+               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
+                       fs setacl -dir /afs/hcoop.net/common/databases/$USERNAME -acl databases 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';"
        ;;
+       passwd)
+               USERNAME=$2
+               PASSWORD=$3
+
+               sudo -H mysql -e "SET PASSWORD FOR '$USERNAME'@'localhost' = PASSWORD('$PASSWORD');"
+       ;;
        createdb)
                USERNAME=$2
                DBNAME_BASE=$3
@@ -28,16 +36,16 @@ case $1 in
                fs setacl -dir $DIR -acl mysql rlid
                fs setacl -dir $DIR -acl databases none
                fs setacl -dir $DIR -acl system:backup rl
-               mkdir $DIR/$DBNAME || exit
+               mkdir $DIR/$DBNAME
                chown mysql:mysql $DIR/$DBNAME
                chmod 770 $DIR/$DBNAME
                ln -sf $DIR/$DBNAME /var/lib/mysql/$DBNAME
                fs setacl -dir $DIR/$DBNAME/ -acl mysql all
 
-               sudo -H mysql -e "GRANT CREATE,DROP,SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE VIEW,SHOW VIEW,GRANT OPTION ON * 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'@'localhost';" $DBNAME
                sudo -H mysql -e "FLUSH PRIVILEGES;"
        ;;
        *)
-               echo "Usage: domtool-mysql [adduser <user> <password> | createdb <user> <table>]"
+               echo "Usage: domtool-mysql [adduser <user> <password> | passwd <user> <password> | createdb <user> <table>]"
        ;;
 esac