From: Adam Chlipala <adamc@hcoop.net>
Date: Mon, 9 Apr 2007 22:01:54 +0000 (+0000)
Subject: SQL Kerberos principal changes; switching some uses of OS.Path.joinDirFile to OS... 
X-Git-Tag: release_2010-11-19~243
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/4cbaa5a74c199730a4601e3eff8a7512dda20165

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

diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index f476c97..7183bcb 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -257,9 +257,7 @@ val () = Slave.registerFileHandler (fn fs =>
 											 file = Slave.hostname ()}
 								   val {base, ...} = OS.Path.splitBaseExt (#file spl)
 
-								   val realLogDir = OS.Path.joinDirFile
-											{dir = realLogDir,
-											 file = base}
+								   val realLogDir = OS.Path.concat (realLogDir, base)
 							       in
 								   if String.isSuffix ".vhost_ssl" (#file spl) then
 								       realLogDir ^ ".ssl"
diff --git a/src/plugins/domtool-mysql b/src/plugins/domtool-mysql
index 2eeb1be..fa3db41 100755
--- 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;"
diff --git a/src/plugins/domtool-postgres b/src/plugins/domtool-postgres
index ded559d..4f85765 100755
--- a/src/plugins/domtool-postgres
+++ b/src/plugins/domtool-postgres
@@ -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
 
@@ -20,8 +21,7 @@ case $1 in
 			sudo -u postgres psql -c "CREATE USER $USERNAME" template1
 			mkdir -p $DIR
 			chown postgres:postgres $DIR
-			fs setacl -dir $DIR -acl postgres write
-			fs setacl -dir $DIR -acl databases none
+			fs setacl -dir $DIR -acl system:postgres write
 			fs setacl -dir $DIR -acl system:backup rl
 
 			sudo -u postgres psql -c "CREATE TABLESPACE user_$USERNAME OWNER $USERNAME LOCATION '$DIR'" template1
diff --git a/src/plugins/hcoop.sml b/src/plugins/hcoop.sml
index 288d984..93d98ec 100644
--- a/src/plugins/hcoop.sml
+++ b/src/plugins/hcoop.sml
@@ -26,12 +26,14 @@ val dl = ErrorMsg.dummyLoc
 
 val _ = Env.type_one "homedir_path"
 	Env.string
-	(fn dir => Domain.yourPath (OS.Path.joinDirFile {dir = Domain.homedir (),
-							 file = dir}))
+	(fn dir => Domain.yourPath (OS.Path.concat (Domain.homedir (), dir))
+		   handle OS.Path.InvalidArc => false
+			| OS.Path.Path => false)
 
 val () = Env.registerFunction ("home",
-			       fn [(EString dir, _)] => SOME (EString (OS.Path.joinDirFile {dir = Domain.homedir (),
-											    file = dir}), dl)
+			       fn [(EString dir, _)] => (SOME (EString (OS.Path.concat (Domain.homedir (), dir)), dl)
+							 handle OS.Path.InvalidArc => NONE
+							      | OS.Path.Path => NONE)
 				| _ => NONE)
 
 end