SQL Kerberos principal changes; switching some uses of OS.Path.joinDirFile to OS...

[hcoop/domtool2.git] / src / plugins / domtool-mysql

diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index 2eeb1be..fa3db41 100755 (executable)
--- a/src/plugins/domtool-mysql
+++ b/src/plugins/domtool-mysql
@@ -12,7 +12,8 @@ case $1 in
                        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: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
 
@@ -34,14 +35,13 @@ case $1 in
                aklog
 
                mkdir -p $DIR
-               fs setacl -dir $DIR -acl mysql rlid
-               fs setacl -dir $DIR -acl databases none
+               fs setacl -dir $DIR -acl system:mysql rlid
                fs setacl -dir $DIR -acl system:backup rl
                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;"