X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/f8ef6c208aee42dd24c8836797a89f786c985a6f..2464c83cc213e1e039275053456d055c2afd48cf:/src/plugins/domtool-mysql?ds=sidebyside

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index fa3db41..4fad400 100755
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -2,22 +2,7 @@
 
 case $1 in
 	adduser)
-		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 system:postgres l
-			fs setacl -dir /afs/hcoop.net/common/databases/$USERNAME -acl system:mysql 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';"
+		echo MySQL user was already created during create-user.
 	;;
 	passwd)
 		USERNAME=$2
@@ -34,9 +19,10 @@ case $1 in
 		kinit -k -t /etc/keytabs/root.admin.keytab root/admin
 		aklog
 
-		mkdir -p $DIR
-		fs setacl -dir $DIR -acl system:mysql rlid
-		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