From c5dbee4ab4e1cd5a35c01d2dc9c561bf12afcc22 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+burette@autogeree.net>
Date: Tue, 9 Apr 2013 17:24:32 +0200
Subject: [PATCH] =?utf8?q?Correction=20:=20vm=5Fhosted=20:=20rule=5Fpostgr?=
 =?utf8?q?esql=5Fconfigure=20:=20sch=C3=A9mas.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 etc/sv/cyclo_paris_est__openerp/configure.sh |  5 +-
 vm_hosted                                    | 83 ++++++++------------
 2 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/etc/sv/cyclo_paris_est__openerp/configure.sh b/etc/sv/cyclo_paris_est__openerp/configure.sh
index 9bc9d12..2aaa891 100644
--- a/etc/sv/cyclo_paris_est__openerp/configure.sh
+++ b/etc/sv/cyclo_paris_est__openerp/configure.sh
@@ -1,7 +1,10 @@
 eval "local home=/home/$sv"
 cd /
 case $(sudo sv status postgres || true) in
- (run:*);;
+ (run:*)
+	while ! sudo -u postgres psql </dev/null
+	do sleep 0.3; done
+	;;
  (*) set -$- "$@" "$sv"; continue=yes; continue;;
  esac
 case $(sudo sv status "$sv" || true) in
diff --git a/vm_hosted b/vm_hosted
index ff2ade9..00d2395 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -749,13 +749,10 @@ rule_mysql_configure () {
 	case $(sudo sv status mysql || true) in
 	 (''|run:*|*"s, normally up;"*)
 		rule runit_sv_restart mysql
-		while case $(sudo inotifywait -e create -- /run/mysqld/sock/) in
-		 ("/run/mysqld/sock/ CREATE mysql") false;;
-		 (*) true;;
-		 esac
-		do true; done
 		(
 		cd /
+			while ! sudo -u mysql mysql -u mysql </dev/null
+			do sleep 0.3; done
 			# NOTE:
 			# - ajoute l'accès par socket Unix à mysql
 			# - ajoute les droits de super-utilisateur à mysql
@@ -1226,22 +1223,19 @@ rule_postgresql_configure () {
 	case $(sudo sv status postgres || true) in
 	 (''|run:*|*"s, normally up;"*)
 		rule runit_sv_restart postgres
-		while case $(sudo inotifywait -e create -- /run/postgresql/) in
-		 ("/run/postgresql/ CREATE .s.PGSQL.5432") false;;
-		 (*) true;;
-		 esac
-		do true; done
 		(
 		cd /
+		while ! sudo -u postgres psql </dev/null
+		do sleep 0.3; done
 		# NOTE: supprime l'accès au schéma public depuis public,
 		#       de sorte à ce que les différents utilisateurices
 		#       ne voient pas leurs bases de données entre-elleux ;
-		#sudo -u postgres psql template1 -a -f - <<-EOF
-		#	\set ON_ERROR_STOP on
-		#	REVOKE ALL ON DATABASE template1 FROM public;
-		#	REVOKE ALL ON SCHEMA   public    FROM public;
-		#	GRANT  ALL ON SCHEMA   public    TO   postgres;
-		#	EOF
+		sudo -u postgres psql template1 -a -f - <<-EOF
+			\set ON_ERROR_STOP on
+			REVOKE ALL ON DATABASE template1 FROM public;
+			REVOKE ALL ON SCHEMA   public    FROM public;
+			GRANT  ALL ON SCHEMA   public    TO   postgres;
+			EOF
 		# NOTE: ajoute le support de PL/PGSQL s'il ne l'est pas déjà.
 		sudo -u postgres psql template1 -a -f - <<-EOF
 			\set ON_ERROR_STOP on
@@ -1268,47 +1262,35 @@ rule_postgresql_configure () {
 			EOF
 		# NOTE: supprime l'accès à la liste des bases données
 		#       et utilisateurices depuis public.
-		#sudo -u postgres psql template1 -a -f - <<-EOF
-		#	\set ON_ERROR_STOP on
-		#	REVOKE ALL ON pg_auth_members FROM public;
-		#	REVOKE ALL ON pg_authid       FROM public;
-		#	REVOKE ALL ON pg_database     FROM public;
-		#	REVOKE ALL ON pg_group        FROM public;
-		#	REVOKE ALL ON pg_roles        FROM public;
-		#	REVOKE ALL ON pg_settings     FROM public;
-		#	REVOKE ALL ON pg_tablespace   FROM public;
-		#	REVOKE ALL ON pg_user         FROM public;
-		#	EOF
+		sudo -u postgres psql template1 -a -f - <<-EOF
+			\set ON_ERROR_STOP on
+			REVOKE ALL ON pg_auth_members FROM public;
+			REVOKE ALL ON pg_authid       FROM public;
+			REVOKE ALL ON pg_database     FROM public;
+			REVOKE ALL ON pg_group        FROM public;
+			REVOKE ALL ON pg_roles        FROM public;
+			REVOKE ALL ON pg_settings     FROM public;
+			REVOKE ALL ON pg_tablespace   FROM public;
+			REVOKE ALL ON pg_user         FROM public;
+			EOF
 		)
 		;;
 	 esac
  }
-rule_postgresql_db_add () { # SYNTAX: $db $db_user
-	local db="$1" db_user="$2"
+rule_postgresql_db_add () { # SYNTAX: $db $owner
+	local db="$1"
+	local owner="${2:-$db}"
 	sudo -u postgres psql template1 -a -f - <<-EOF
 		\set ON_ERROR_STOP on
 		DO LANGUAGE plpgsql \$\$
 		BEGIN
 			IF NOT EXISTS (
 			 SELECT *
-			 FROM pg_catalog.pg_roles
-			 WHERE rolname = '${db}_role'
+			 FROM pg_catalog.pg_user
+			 WHERE usename = '$owner'
 			 LIMIT 1
 			) THEN
-				CREATE ROLE ${db}_role
-				 NOCREATEDB
-				 NOCREATEROLE
-				 NOINHERIT
-				 NOLOGIN
-				 NOSUPERUSER;
-			END IF;
-			IF NOT EXISTS (
-				SELECT *
-				FROM pg_catalog.pg_user
-				WHERE usename = '$db_user'
-				LIMIT 1
-			) THEN
-				CREATE ROLE $db_user
+				CREATE ROLE $owner
 				 LOGIN
 				 NOCREATEDB
 				 NOCREATEROLE
@@ -1324,20 +1306,22 @@ rule_postgresql_db_add () { # SYNTAX: $db $db_user
 	 (*)
 		sudo -u postgres psql template1 -a -f - <<-EOF
 			\set ON_ERROR_STOP on
-			CREATE DATABASE $db WITH OWNER=$db_user;
+			CREATE DATABASE $db WITH OWNER=$owner;
 			EOF
 		;;
 	 esac
 	sudo -u postgres psql template1 -a -f - <<-EOF
 		\set ON_ERROR_STOP on
-		GRANT ${db}_role TO $db_user;
-		ALTER USER $db SET search_path to $db;
 		REVOKE ALL ON DATABASE $db FROM public;
 		EOF
+	sudo -u postgres psql "$db" -a -f - <<-EOF
+		\set ON_ERROR_STOP on
+		GRANT ALL ON SCHEMA public TO $owner WITH GRANT OPTION;
+		EOF
  }
 rule_postgresql_db_user_add () { # SYNTAX: $db $user
 	local db="$1" user="$2"
-	sudo -u postgres psql template1 -a -f - <<-EOF
+	sudo -u postgres psql "$db" -a -f - <<-EOF
 		\set ON_ERROR_STOP on
 		DO LANGUAGE plpgsql \$\$
 		BEGIN
@@ -1358,7 +1342,6 @@ rule_postgresql_db_user_add () { # SYNTAX: $db $user
 		\$\$;
 		GRANT USAGE ON SCHEMA public TO $user;
 		GRANT CONNECT,TEMPORARY ON DATABASE $db TO $user;
-		GRANT $db TO $user;
 		EOF
  }
 rule_openerp_configure () {
-- 
2.20.1