X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/6ee7d8effaa01367374de19205359747f5b099e2..68d797e9baea9dac27d01e768ee3d860c61d8927:/src/plugins/domtool-mysql

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index 02dcefa..c7aac5f 100755
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -1,45 +1,43 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 case $1 in
 	adduser)
 		USERNAME=$2
 		PASSWORD=$3
 
-		kinit -k -t /etc/keytabs/root.admin.keytab root/admin
-		aklog
+		sudo -H mysql -e "CREATE USER '$USERNAME'@'localhost' IDENTIFIED BY '$PASSWORD';"
+	;;
 
-		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
+	passwd)
+		USERNAME=$2
+		PASSWORD=$3
 
-		sudo -H mysql -e "CREATE USER '$USERNAME'@'localhost' IDENTIFIED BY '$PASSWORD';"
+		sudo -H mysql -e "SET PASSWORD FOR '$USERNAME'@'localhost' = PASSWORD('$PASSWORD');"
 	;;
+
 	createdb)
 		USERNAME=$2
 		DBNAME_BASE=$3
 		DBNAME="${USERNAME}_${DBNAME_BASE}"
-		DIR=/afs/hcoop.net/common/databases/$USERNAME/mysql
+		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
 
-		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;"
 	;;
 	*)
-		echo "Usage: domtool-mysql [adduser <user> <password> | createdb <user> <table>]"
+		echo "Usage: domtool-mysql [adduser <user> <password> | passwd <user> <password> | createdb <user> <table>]"
 	;;
 esac