From 323e2d5e30557de603b501b7fccc1f7bad1af1d8 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+heureux-cyclage@autogeree.net>
Date: Fri, 27 Sep 2013 00:42:41 +0200
Subject: [PATCH] Correction : openerp_cyclofficines : poursuit la
 mutualisation.

---
 etc/postgresql/9.1/main/pg_hba.conf   | 23 +++++++++++++----------
 etc/sv/openerp_cyclofficines/local.sh |  7 +++----
 etc/sv/openerp_cyclofficines/run      | 15 ++++++++-------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/etc/postgresql/9.1/main/pg_hba.conf b/etc/postgresql/9.1/main/pg_hba.conf
index 460ebd3..fd409f9 100644
--- a/etc/postgresql/9.1/main/pg_hba.conf
+++ b/etc/postgresql/9.1/main/pg_hba.conf
@@ -1,10 +1,13 @@
-# CONNECTION  DATABASE  USER      AUTH      OPTIONS
-local         all       postgres  peer      map=admin
-local         all       backup    peer
-local         sameuser  all       peer      map=user
-local         samerole  all       peer      map=role
-local         postgres  openerp_lhc_demo    peer
-local         postgres  openerp_ptitvelo    peer
-local         postgres  openerp_velosenville    peer
-local         template1 openerp_server_lhc  peer
-hostssl       all       postgres  samehost  cert
+# CONNECTION  DATABASE                 USER                     AUTH      OPTIONS
+local         all                      postgres                 peer      map=admin
+local         all                      backup                   peer
+local         openerp_cyclo_paris_est  openerp_cyclofficines    peer
+local         openerp_cyclo_ivry       openerp_cyclofficines    peer
+local         postgres                 openerp_cyclofficines    peer
+local         postgres                 openerp_lhc_demo         peer
+local         postgres                 openerp_ptitvelo         peer
+local         postgres                 openerp_velosenville     peer
+local         template1                openerp_server_lhc       peer
+local         sameuser                 all                      peer      map=user
+local         samerole                 all                      peer      map=role
+hostssl       all                      postgres                 samehost  cert
diff --git a/etc/sv/openerp_cyclofficines/local.sh b/etc/sv/openerp_cyclofficines/local.sh
index dc04c3c..bafe79e 100644
--- a/etc/sv/openerp_cyclofficines/local.sh
+++ b/etc/sv/openerp_cyclofficines/local.sh
@@ -32,13 +32,13 @@ sudo ln -fns \
 
 while ! sudo -u postgres psql </dev/null
 do sleep 1; done
-"$tool"/local/postgresql-role-create "$sv"
+"$tool"/local/postgresql-user-create "$sv"
 for db in \
 	openerp_cyclo_ivry \
 	openerp_cyclo_paris_est
  do
-	"$tool"/local/postgresql-user-create "$db"
-	"$tool"/local/postgresql-database-create "$db"
+	#"$tool"/local/postgresql-role-create "$db"
+	"$tool"/local/postgresql-database-create "$db" "$sv"
 	sudo install -d -m 750 -o "$sv" -g "$sv" \
 	 "$home"/etc \
 	 /etc/openerp/"$db"
@@ -103,5 +103,4 @@ for addon in \
 		 esac
 		EOF
  done
-
 exit 42
diff --git a/etc/sv/openerp_cyclofficines/run b/etc/sv/openerp_cyclofficines/run
index f148ab1..9269b8e 100755
--- a/etc/sv/openerp_cyclofficines/run
+++ b/etc/sv/openerp_cyclofficines/run
@@ -10,19 +10,18 @@ for db in \
  openerp_cyclo_ivry \
  openerp_cyclo_paris_est
  do
-	test -e /etc/openerp/"$db"/server.conf ||
+	test -e /etc/openerp/"${sv#openerp_}"/"${db#openerp_}".ok ||
 	/usr/bin/chpst \
 	 -u "$sv":"$sv":"$sv"-addon:postgres-data \
 	 /usr/bin/openerp-server \
 	 --addons-path="$home"/addon.d \
-	 --config /etc/openerp/"$db"/server.conf \
+	 --config /etc/openerp/"${sv#openerp_}"/server.conf \
 	 --database="$db" \
 	 --db_host=/run/postgresql \
-	 --db_user="$db" \
+	 --db_user="$sv" \
 	 --debug \
 	 --init=remembership,pos_membership,bikecoop \
 	 --load-language=fr_FR \
-	 --no-database-list \
 	 --no-xmlrpcs \
 	 --osv-memory-age-limit=0.1 \
 	 --proxy-mode \
@@ -32,15 +31,17 @@ for db in \
 	 --without-demo=base \
 	 --workers=0 \
 	 --xmlrpc-interface=127.0.0.1 \
-	 --xmlrpc-port=8069 \
+	 --xmlrpc-port=8069
+	 #--no-database-list \
 	 # NOTE: si --workers > 0
 	 # --limit-memory-hard=$((300 * 1024 * 1024))
 	 # --limit-memory-soft=$((150 * 1024 * 1024))
+	touch /etc/openerp/"${sv#openerp_}"/"${db#openerp_}".ok
  done
 
 exec /usr/bin/chpst \
  -u "$sv":"$sv":"$sv"-addon:postgres-data \
  /usr/bin/openerp-server \
- --config /etc/openerp/"$db"/server.conf \
+ --config /etc/openerp/"${sv#openerp_}"/server.conf \
  --load-language=fr_FR \
- #--database="$sv"
+ "$@"
-- 
2.20.1