From 81e7625eeb788b2de846fe3ab1ce58c1c03f43a0 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+burette@autogeree.net>
Date: Sun, 7 Apr 2013 03:19:24 +0200
Subject: [PATCH] Ajout : etc/sv/openerp/ .

---
 etc/init.d/tmpfs                             |   5 +-
 etc/nginx/site.d/lhc-remorque/configure.sh   |   2 +-
 etc/postgresql/9.1/main/postgresql.conf      |   4 +-
 etc/sv/cyclo_paris_est__openerp/configure.sh |  94 +++++++
 etc/sv/cyclo_paris_est__openerp/log/run      |   7 +
 etc/sv/cyclo_paris_est__openerp/run          |   8 +
 vm_hosted                                    | 242 +++++++++++++------
 7 files changed, 287 insertions(+), 75 deletions(-)
 create mode 100644 etc/sv/cyclo_paris_est__openerp/configure.sh
 create mode 100644 etc/sv/cyclo_paris_est__openerp/log/run
 create mode 100755 etc/sv/cyclo_paris_est__openerp/run

diff --git a/etc/init.d/tmpfs b/etc/init.d/tmpfs
index 05370f0..a80f6bc 100755
--- a/etc/init.d/tmpfs
+++ b/etc/init.d/tmpfs
@@ -56,9 +56,8 @@ do_start() {
 			 /run/mysqld/sock
 			
 			! getent passwd postgres >/dev/null ||
-			sudo install -d -m 1771 -o postgres -g postgres \
-			 /run/postgresql \
-			 /run/postgresql/sock
+			sudo install -d -m 710 -o postgres -g postgres-data \
+			 /run/postgresql
 			
 			sudo install -d -m 1771 -o root -g root \
 			 /run/spawn-fcgi
diff --git a/etc/nginx/site.d/lhc-remorque/configure.sh b/etc/nginx/site.d/lhc-remorque/configure.sh
index e8b451d..5012c6e 100644
--- a/etc/nginx/site.d/lhc-remorque/configure.sh
+++ b/etc/nginx/site.d/lhc-remorque/configure.sh
@@ -30,7 +30,7 @@ sudo install -d -m 2770 -o wiki-"$site" -g wiki-"$site" \
 sudo install -d -m 2750 -o wiki-"$site" -g git \
  /home/git/hooks/lhc \
  /home/git/hooks/lhc/remorque
-sudo install -m 3771 -o git -g git /dev/stdin \
+sudo install -m 771 -o git -g git /dev/stdin \
  /home/git/pub/lhc/remorque.git/hooks/post-update <<-EOF
 	#!/bin/sh -efux
 	
diff --git a/etc/postgresql/9.1/main/postgresql.conf b/etc/postgresql/9.1/main/postgresql.conf
index e723641..8af2f1c 100644
--- a/etc/postgresql/9.1/main/postgresql.conf
+++ b/etc/postgresql/9.1/main/postgresql.conf
@@ -64,7 +64,7 @@ default_text_search_config = 'pg_catalog.french'
 #enable_tidscan = on
 #escape_string_warning = on
 #exit_on_error = off # terminate session on any error?
-external_pid_file = '/run/postgresql/9.1-main.pid' # write an extra PID file
+#external_pid_file = '/run/postgresql/9.1-main.pid' # write an extra PID file
 #extra_float_digits = 0 # min -15, max 3
 #from_collapse_limit = 8
 #fsync = on # turns forced synchronization on or off
@@ -164,7 +164,7 @@ ssl = off # (change requires restart)
 #track_counts = on
 #track_functions = none # none, pl, all
 #transform_null_equals = off
-unix_socket_directory = '/run/postgresql/sock' # (change requires restart)
+unix_socket_directory = '/run/postgresql' # (change requires restart)
 unix_socket_group = 'postgres-data' # (change requires restart)
 unix_socket_permissions = 0770 # begin with 0 to use octal notation
 #update_process_title = on
diff --git a/etc/sv/cyclo_paris_est__openerp/configure.sh b/etc/sv/cyclo_paris_est__openerp/configure.sh
new file mode 100644
index 0000000..1424c4f
--- /dev/null
+++ b/etc/sv/cyclo_paris_est__openerp/configure.sh
@@ -0,0 +1,94 @@
+eval "local home=/home/$sv"
+cd /
+case $(sudo sv status postgres || true) in
+ (run:*);;
+ (*) set -$- "$@" "$sv"; continue=yes; continue;;
+ esac
+case $(sudo sv status "$sv" || true) in
+ (run:*) sudo sv stop "$sv";;
+ esac
+rule adduser "$sv" \
+ --disabled-login \
+ --disabled-password \
+ --group \
+ --home "$home" \
+ --shell /bin/false \
+ --system
+rule adduser log-"$sv"\
+ --disabled-login \
+ --disabled-password \
+ --group \
+ --home "$home"/log \
+ --shell /bin/false \
+ --system
+rule adduser "$sv"-addon \
+ --disabled-login \
+ --disabled-password \
+ --group \
+ --home "$home"/addon.d \
+ --shell /bin/false \
+ --system
+sudo install -d -m 3771 -o "$sv" -g "$sv" \
+ "$home"/
+sudo install -d -m 770 -o log-"$sv" -g log-"$sv" \
+ "$home"/log
+sudo install -d -m 2770 -o "$sv" -g "$sv"-addon \
+ "$home"/addon.d
+sudo adduser git   "$sv"-addon
+sudo adduser "$sv" "$sv"-addon
+sudo adduser "$sv" postgres-data
+sudo install -d -m 2770 -o "$sv" -g "$sv" \
+ /etc/sv/"$sv" \
+ /etc/sv/"$sv"/log
+sudo install -d -m 750 -o "$sv" -g "$sv" \
+ "$home"/etc \
+ /etc/openerp/"$sv"
+sudo ln -fns \
+ /etc/openerp/"$sv" \
+ "$home"/etc/openerp
+for addon in \
+	bikecoop \
+	bikecoop_l10n_fr \
+	pos_membership \
+	remembership \
+	cyclofficine_paris_est
+ do
+	sudo install -d -m 2771 -o "$sv" -g "$sv"-addon \
+	 "$home"/addon.d/"$addon"
+	sudo -u git git \
+	 --git-dir ~git-data/burette/"$addon".git \
+	 --work-tree="$home"/addon.d/"$addon" \
+	 checkout -f master
+	#sudo -u git git \
+	# --git-dir ~git-data/burette/"$addon".git \
+	# --work-tree="$home"/addon.d/"$addon" \
+	# clean -d -f -f -x
+	sudo install -m 550 -o git -g git /dev/stdin \
+	 /home/git/pub/burette/"$addon".git/hooks/post-update <<-EOF
+		git \
+		 --git-dir ~git-data/burette/"$addon".git \
+		 --work-tree="$home"/addon.d/"$addon" \
+		 checkout -f master
+		#git \
+		# --git-dir ~git-data/burette/"$addon".git \
+		# --work-tree="$home"/addon.d/"$addon" \
+		# clean -d -f -f -x
+		#sv restart "$sv"
+		EOF
+ done
+case $(sudo sv status "$sv" || true) in
+ (run:*) sudo sv stop "$sv";;
+ esac
+rule postgresql_db_add "$sv" "$sv"
+sudo -u "$sv" openerp-server \
+ --addons-path="$home"/addon.d \
+ --config "$home"/etc/openerp/server.conf \
+ --database="$sv" \
+ --db_user="$sv" \
+ --debug \
+ --init=remembership,pos_membership,bikecoop \
+ --load-language=fr_FR \
+ --save \
+ --stop-after-init \
+ --without-demo=base \
+ --workers=2
diff --git a/etc/sv/cyclo_paris_est__openerp/log/run b/etc/sv/cyclo_paris_est__openerp/log/run
new file mode 100644
index 0000000..96866cb
--- /dev/null
+++ b/etc/sv/cyclo_paris_est__openerp/log/run
@@ -0,0 +1,7 @@
+#!/bin/sh -eux
+sv=${PWD%/log}
+sv=${sv#/etc/sv/}
+eval "home=~log-$sv"
+cd "$home"
+exec chpst -u log-"$sv":log-"$sv" \
+	svlogd -v -tt "$home"
diff --git a/etc/sv/cyclo_paris_est__openerp/run b/etc/sv/cyclo_paris_est__openerp/run
new file mode 100755
index 0000000..074e16b
--- /dev/null
+++ b/etc/sv/cyclo_paris_est__openerp/run
@@ -0,0 +1,8 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+eval "home=~$sv"
+exec /usr/bin/chpst \
+ -u "$sv":"$sv":"$sv"-addon:postgres-data \
+ openerp-server \
+	 --config "$home"/etc/openerp/server.conf
diff --git a/vm_hosted b/vm_hosted
index f80192c..d882ce8 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -1061,8 +1061,8 @@ rule_php5_fpm_configure () {
 		sudo install -m 664 -o php5 -g php5 \
 		 "$tool"/etc/php5/fpm/php.ini \
 		        /etc/php5/fpm/php.ini
-		case $(sudo sv status php5-"$pool") in
-		 (run:*) sudo sv restart php5-"$pool"
+		case $(sudo sv status php5-"$pool" || true) in
+		 (''|run:*) sudo sv restart php5-"$pool"
 		 esac
 	 done
 	rule tmpfs_configure
@@ -1180,7 +1180,7 @@ rule_postgresql_configure () {
 	sudo adduser postgres postgres-data
 	sudo rm -rf \
 	 /etc/postgresql
-	sudo install -d -m 750 -o postgres -g postgres \
+	sudo install -d -m 1751 -o postgres -g postgres-data \
 	 /home/postgresql \
 	 /home/postgresql/etc \
 	 /etc/postgresql \
@@ -1189,9 +1189,10 @@ rule_postgresql_configure () {
 	sudo ln -fns \
 	                 /etc/postgresql \
 	 /home/postgresql/etc/postgresql
-	sudo install -d -m 751 -o postgres -g postgres \
+	sudo install -d -m 2770 -o postgres -g log-postgres \
 	 /home/postgresql/log \
-	 /home/postgresql/log/9.1
+	 /home/postgresql/log/9.1 \
+	 /home/postgresql/log/9.1/main
 	sudo service tmpfs restart
 	if sudo test ! -d /home/postgresql/data
 	 then
@@ -1201,9 +1202,9 @@ rule_postgresql_configure () {
 		cd /
 		sudo -u postgres pg_createcluster \
 		 --datadir=/home/postgresql/data \
-		 --logfile=/home/postgresql/log/9.1/main  \
-		 --socketdir=/run/postgresql/sock \
-		 --start 9.1 main
+		 --logfile=/home/postgresql/log/9.1/main/cluster.log  \
+		 --socketdir=/run/postgresql \
+		 9.1 main
 		)
 	 fi
 	sudo install -m 770 -o postgres -g postgres /dev/stdin \
@@ -1211,7 +1212,7 @@ rule_postgresql_configure () {
 		local all postgres peer
 		local all all      peer
 		EOF
-	sudo install -m 660 -o postgres -g postgres \
+	sudo install -m 640 -o postgres -g postgres-data \
 	 "$tool"/etc/postgresql/9.1/main/postgresql.conf \
 	        /etc/postgresql/9.1/main/postgresql.conf
 	sudo insserv -r postgresql
@@ -1219,54 +1220,135 @@ rule_postgresql_configure () {
 	case $(sudo sv status postgres || true) in
 	 (''|run:*|*"s, normally up;"*)
 		sudo sv restart postgres
+		while case $(sudo inotifywait -e create -- /run/postgresql/) in
+			 ("/run/postgresql/ CREATE .s.PGSQL.5432") true;;
+			 (*) false;;
+			 esac
+		do true; done
 		(
 		cd /
-		case $(sudo inotifywait -e create -- /run/postgresql/sock/) in
-		 ("/run/postgresql/sock/ CREATE .s.PGSQL."*)
-			# 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 ;
-			# - ajoute le support de PL/PGSQL.
-			sudo -u postgres psql template1 -f - <<-EOF
-				REVOKE ALL ON DATABASE template1 FROM public;
-				REVOKE ALL ON SCHEMA   public    FROM public;
-				GRANT  ALL ON SCHEMA   public    TO   postgres;
-				CREATE LANGUAGE plpgsql;
-				EOF
-			# NOTE:
-			# - supprime l'accès à la liste des bases données
-			#   et utilisateurices depuis public.
-			sudo -u postgres psql template1 -f - <<-EOF
-				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
+		# 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
+		# 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
+			CREATE OR REPLACE FUNCTION create_language_plpgsql()
+				RETURNS BOOLEAN AS \$\$
+					CREATE LANGUAGE plpgsql;
+					SELECT TRUE;
+				\$\$ LANGUAGE SQL;
+			SELECT CASE WHEN NOT (
+				SELECT  TRUE AS exists
+				FROM    pg_language
+				WHERE   lanname = 'plpgsql'
+				UNION
+				SELECT  FALSE AS exists
+				ORDER BY exists DESC
+				LIMIT 1
+			 )
+			THEN
+				create_language_plpgsql()
+			ELSE
+				FALSE
+			END AS plpgsql_created;
+			DROP FUNCTION create_language_plpgsql();
+			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
 		)
 		;;
 	 esac
  }
 rule_postgresql_db_add () { # SYNTAX: $db $db_user
 	local db="$1" db_user="$2"
-	sudo -u postgresql psql template1 -f - <<-EOF
-		CREATE ROLE $db      NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT NOLOGIN;
-		CREATE ROLE $db_user NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED;
-		GRANT $db TO $db_user;
-		CREATE DATABASE $db WITH OWNER=$db_user;
+	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'
+			 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
+				 LOGIN
+				 NOCREATEDB
+				 NOCREATEROLE
+				 NOINHERIT
+				 NOSUPERUSER;
+			END IF;
+		END;
+		\$\$;
+		EOF
+	case $(sudo -u postgres psql template1 -t -c \
+		"SELECT datname FROM pg_catalog.pg_database WHERE datname = '$db' LIMIT 1") in
+	 (" $db") true;;
+	 (*)
+		sudo -u postgres psql template1 -a -f - <<-EOF
+			\set ON_ERROR_STOP on
+			CREATE DATABASE $db WITH OWNER=$db_user;
+			EOF
+		;;
+	 esac
+	sudo -u postgres psql template1 -a -f - <<-EOF
+		\set ON_ERROR_STOP on
+		GRANT ${db}_role TO $db_user;
 		REVOKE ALL ON DATABASE $db FROM public;
 		EOF
  }
 rule_postgresql_db_user_add () { # SYNTAX: $db $user
 	local db="$1" user="$2"
-	sudo -u postgresql psql template1 -f - <<-EOF
-		CREATE ROLE $user NOSUPERUSER NOCREATEDB NOCREATEROLE NOINHERIT LOGIN ENCRYPTED;
+	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_user
+			 WHERE usename = '$user'
+			 LIMIT 1
+			) THEN
+				CREATE ROLE $user
+				 LOGIN
+				 NOCREATEDB
+				 NOCREATEROLE
+				 NOINHERIT
+				 NOSUPERUSER;
+			END IF;
+		END;
+		\$\$;
 		GRANT USAGE ON SCHEMA public TO $user;
 		GRANT CONNECT,TEMPORARY ON DATABASE $db TO $user;
 		GRANT $db TO $user;
@@ -1276,8 +1358,12 @@ rule_openerp_configure () {
 	sudo install -m 660 -o root -g root /dev/stdin /etc/apt/sources.list.d/openerp.list <<-EOF
 		deb http://nightly.openerp.com/trunk/nightly/deb/ ./
 		EOF
+	sudo install -d -m 1777 -o root -g root \
+	 /etc/openerp
 	sudo apt-get update
-	rule apt_get_install openerp
+	rule apt_get_install openerp --force-yes
+		# XXX: --force-yes car les paquets de nightly.openerp.com
+		#      ne sont pas signés par OpenPGP..
  }
 rule_postgrey_configure () {
 	rule apt_get_install postgrey
@@ -1299,39 +1385,57 @@ rule_runit_configure () { # SYNTAX: $service
 	local -; set +f
 	for sv in ${1-/etc/service/*}
 	 # NOTE: stoppe les services en retenant leur status de départ
-	 do sv=$(basename "$sv")
+	 do sv=${sv##*/}
 		local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
 		local sv_status
 		IFS= read -r sv_status_$sv_hash <<-EOF
-			$(sudo sv status "$sv")
+			$(sudo sv status "$sv" || true)
 			EOF
 		sudo rm -f /etc/service/"$sv"
 	 done
-	for sv in ${1-"$tool"/etc/sv/*}
+	set -$- ${1-"$tool"/etc/sv/*}
+	while test -n "$*"
 	 # NOTE: configure et (re-)démarre les services
-	 do sv=$(basename "$sv")
-		local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
-		sudo install -d -m 770 -o root -g root \
-		 /etc/sv/"$sv"
-		sudo install -m 770 -o root -g root \
-		 "$tool"/etc/sv/"$sv"/run \
-		        /etc/sv/"$sv"/run
-		if test -e "$tool"/etc/sv/"$sv"/log/run
-		 then
+	 do local first=yes
+		for sv in "$@"
+		do sv=${sv##*/}
+			case $first in
+			 (yes) shift $#; first=;;
+			 esac
+			local sv_hash=$(printf %s "$sv" | sha1sum | cut -f 1 -d ' ')
 			sudo install -d -m 770 -o root -g root \
-			 /etc/sv/"$sv"/log
+			 /etc/sv/"$sv"
 			sudo install -m 770 -o root -g root \
-			 "$tool"/etc/sv/"$sv"/log/run \
-			        /etc/sv/"$sv"/log/run
-		 fi
-		test ! -r "$tool"/etc/sv/"$sv"/configure.sh ||
-		.         "$tool"/etc/sv/"$sv"/configure.sh
-		sudo ln -fns ../sv/"$sv" /etc/service/"$sv"
-		eval local sv_status=\"\${sv_status_$sv_hash-}\"
-		case $sv_status in
-		 ("") true;;
-		 (run:*) sudo sv restart "$sv";;
-		 esac
+			 "$tool"/etc/sv/"$sv"/run \
+			        /etc/sv/"$sv"/run
+			if test -e "$tool"/etc/sv/"$sv"/log/run
+			 then
+				sudo install -d -m 770 -o root -g root \
+				 /etc/sv/"$sv"/log
+				sudo install -m 770 -o root -g root \
+				 "$tool"/etc/sv/"$sv"/log/run \
+				        /etc/sv/"$sv"/log/run
+			 fi
+			local continue=
+			test ! -r "$tool"/etc/sv/"$sv"/configure.sh ||
+			.         "$tool"/etc/sv/"$sv"/configure.sh
+			case $continue in
+			 (yes) continue;;
+			 esac
+			sudo ln -fns ../sv/"$sv" /etc/service/"$sv"
+			eval local sv_status=\"\${sv_status_$sv_hash-}\"
+			case $sv_status in
+			 ("") true;;
+			 (fail:*) sleep 1 && sudo sv start "$sv";;
+			 (run:*)
+				while true
+				 do case $(sudo sv restart "$sv") in
+					 ("fail: $sv: runsv not running") sleep 1;;
+					 (*) break;;
+					 esac
+				 done
+			 esac
+		 done
 	 done
  }
 rule_ssh_configure () {
-- 
2.20.1