X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/a215ab4e803c5e8c9bae21d62eaccb2052f4f2d2..53cb7cc1a416d38a26a5287478e00920f3d67b7c:/src/plugins/domtool-mysql

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index 2eeb1be..657ed00 100755
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -5,19 +5,8 @@ case $1 in
 		USERNAME=$2
 		PASSWORD=$3
 
-		kinit -k -t /etc/keytabs/root.admin.keytab root/admin
-		aklog
-
-		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
-			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
-		fi
-
 		sudo -H mysql -e "CREATE USER '$USERNAME'@'localhost' IDENTIFIED BY '$PASSWORD';"
-	;;
+
 	passwd)
 		USERNAME=$2
 		PASSWORD=$3
@@ -33,15 +22,15 @@ case $1 in
 		kinit -k -t /etc/keytabs/root.admin.keytab root/admin
 		aklog
 
-		mkdir -p $DIR
-		fs setacl -dir $DIR -acl mysql rlid
-		fs setacl -dir $DIR -acl databases none
-		fs setacl -dir $DIR -acl system:backup rl
+		if ! -d $DIR; then
+			echo WARNING: $DIR must already exist!
+		fi
+
 		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
+		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 "FLUSH PRIVILEGES;"