Remove 'vos release' from domtool-mysql

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index 5873ec9..02dcefa 100755 (executable)
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -8,11 +8,13 @@ case $1 in
                kinit -k -t /etc/keytabs/root.admin.keytab root/admin
                aklog
 
                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';"
        ;;
        createdb)
                sudo -H mysql -e "CREATE USER '$USERNAME'@'localhost' IDENTIFIED BY '$PASSWORD';"
        ;;
        createdb)


@@ -28,13 +30,13 @@ 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
                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
 
                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;"
        ;;
        *)
                sudo -H mysql -e "FLUSH PRIVILEGES;"
        ;;
        *)