X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/5ad00addff68d8957629499e019c4a001051aca4..e140629ff492a6440c7b0d892d27ed443a2f9cd9:/src/plugins/domtool-mysql?ds=sidebyside

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index 4f9c9ce..b3690ff 100755
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -21,10 +21,7 @@ case $1 in
 		USERNAME=$2
 		DBNAME_BASE=$3
 		DBNAME="${USERNAME}_${DBNAME_BASE}"
-		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
+		DIR=/srv/databases/${USERNAME:0:1}/${USERNAME:0:2}/$USERNAME/mysql
 
 		if [ ! -d $DIR ]; then
 			echo WARNING: $DIR must already exist!
@@ -34,9 +31,9 @@ case $1 in
 		chown mysql:mysql $DIR/$DBNAME
 		chmod 770 $DIR/$DBNAME
 		ln -sf $DIR/$DBNAME /var/lib/mysql/$DBNAME
-		fs setacl -dir $DIR/$DBNAME/ -acl system:mysql all
+		chmod g+rw -R $DIR/$DBNAME/
+		sudo -H mysql -e "GRANT CREATE,CREATE TEMPORARY TABLES,SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE VIEW,SHOW VIEW,LOCK TABLES,GRANT OPTION ON TABLE * TO '$USERNAME'@$WHERE;" $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;"
 	;;
 
@@ -45,10 +42,18 @@ case $1 in
 		DBNAME_BASE=$3
 		DBNAME="${USERNAME}_${DBNAME_BASE}"
 
-		sudo -H mysql -e "DROP DATABASE $DBNAME";
+		sudo -H mysql -e "DROP DATABASE $DBNAME;"
+	;;
+
+	grant)
+		USERNAME=$2
+		DBNAME_BASE=$3
+		DBNAME="${USERNAME}_${DBNAME_BASE}"
+
+		sudo -H mysql -e "GRANT CREATE,SELECT,INSERT,UPDATE,DELETE,INDEX,ALTER,CREATE VIEW,SHOW VIEW,LOCK TABLES,GRANT OPTION ON TABLE * TO '$USERNAME'@$WHERE;" $DBNAME
 	;;
 
 	*)
-		echo "Usage: domtool-mysql [adduser <user> <password> | passwd <user> <password> | createdb <user> <db> | dropdb <user> <db>]"
+		echo "Usage: domtool-mysql [adduser <user> <password> | passwd <user> <password> | createdb <user> <db> | dropdb <user> <db> | grant <user> <db>]"
 	;;
 esac