From e88d702f1920c2bac5029e11a795ca59d6278273 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+heureux-cyclage@autogeree.net>
Date: Fri, 12 Jul 2013 13:14:01 +0200
Subject: [PATCH] Modification : openerp_cyclo_paris_est ->
 openerp_cyclofficines .

---
 etc/postgresql/9.1/main/pg_ident.conf         | 20 ++++----
 etc/sv/openerp_cyclo_paris_est/run            | 41 -----------------
 .../local.sh                                  | 45 ++++++++++--------
 .../log/local.sh                              |  0
 .../log/run                                   |  0
 etc/sv/openerp_cyclofficines/run              | 46 +++++++++++++++++++
 6 files changed, 83 insertions(+), 69 deletions(-)
 delete mode 100755 etc/sv/openerp_cyclo_paris_est/run
 rename etc/sv/{openerp_cyclo_paris_est => openerp_cyclofficines}/local.sh (89%)
 rename etc/sv/{openerp_cyclo_paris_est => openerp_cyclofficines}/log/local.sh (100%)
 rename etc/sv/{openerp_cyclo_paris_est => openerp_cyclofficines}/log/run (100%)
 create mode 100755 etc/sv/openerp_cyclofficines/run

diff --git a/etc/postgresql/9.1/main/pg_ident.conf b/etc/postgresql/9.1/main/pg_ident.conf
index 0744b33..8e1e3d6 100644
--- a/etc/postgresql/9.1/main/pg_ident.conf
+++ b/etc/postgresql/9.1/main/pg_ident.conf
@@ -1,9 +1,11 @@
-# MAPNAME  SYSTEM-USERNAME  PG-USERNAME
-admin      postgres         postgres
-admin      root             postgres
-role       postgres         davical_dba
-role       php5_davical     davical_app
-user       postgres         agendav
-user       root             roundcube
-user       /^php5_(.*)$     \1
-user       /^(.*)$          \1
+# MAPNAME  SYSTEM-USERNAME       PG-USERNAME
+admin      postgres              postgres
+admin      root                  postgres
+role       postgres              davical_dba
+role       php5_davical          davical_app
+role       openerp_cyclofficines openerp_cyclo_ivry
+role       openerp_cyclofficines openerp_cyclo_paris_est
+user       postgres              agendav
+user       root                  roundcube
+user       /^php5_(.*)$          \1
+user       /^(.*)$               \1
diff --git a/etc/sv/openerp_cyclo_paris_est/run b/etc/sv/openerp_cyclo_paris_est/run
deleted file mode 100755
index d3c2de7..0000000
--- a/etc/sv/openerp_cyclo_paris_est/run
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh -eux
-exec 2>&1
-sv=${PWD#/etc/sv/}
-home=/home/"$sv"
-cd /
-export LOGNAME="$sv"
- # NOTE: openerp utilise /tmp/oe-sessions-$LOGNAME
-
-test -e /etc/openerp/"${sv#openerp_}"/server.conf ||
-/usr/bin/chpst \
- -u "$sv":"$sv":"$sv"-addon:postgres-data \
- /usr/bin/openerp-server \
- --addons-path="$home"/addon.d \
- --config /etc/openerp/"${sv#openerp_}"/server.conf \
- --database="$sv" \
- --db_host=/run/postgresql \
- --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 \
- --save \
- --stop-after-init \
- --timezone="$(cat /etc/timezone)" \
- --without-demo=base \
- --workers=0 \
- --xmlrpc-interface=127.0.0.1 \
- --xmlrpc-port=8069 \
- # NOTE: si --workers > 0
- # --limit-memory-hard=$((300 * 1024 * 1024))
- # --limit-memory-soft=$((150 * 1024 * 1024))
-
-exec /usr/bin/chpst \
- -u "$sv":"$sv":"$sv"-addon:postgres-data \
- /usr/bin/openerp-server \
- --config "$home"/etc/openerp/server.conf \
- --load-language=fr_FR \
- #--database="$sv"
diff --git a/etc/sv/openerp_cyclo_paris_est/local.sh b/etc/sv/openerp_cyclofficines/local.sh
similarity index 89%
rename from etc/sv/openerp_cyclo_paris_est/local.sh
rename to etc/sv/openerp_cyclofficines/local.sh
index b624f34..e6887a3 100644
--- a/etc/sv/openerp_cyclo_paris_est/local.sh
+++ b/etc/sv/openerp_cyclofficines/local.sh
@@ -5,21 +5,6 @@ home=/home/"$sv"
 	#      ne sont pas signés par OpenPGP..
 "$tool"/local/insserv-remove  openerp
 
-while ! sudo -u postgres psql </dev/null
-do sleep 1; done
-"$tool"/local/postgresql-user-create     "$sv"
-"$tool"/local/postgresql-database-create "$sv"
-sudo -u postgres psql -AqtX "$sv" <<-EOF
-	\set ON_ERROR_STOP on
-	GRANT USAGE  ON SCHEMA pg_catalog               TO $sv;
-	GRANT SELECT ON TABLE  pg_catalog.pg_attribute  TO $sv;
-	GRANT SELECT ON TABLE  pg_catalog.pg_class      TO $sv;
-	GRANT SELECT ON TABLE  pg_catalog.pg_constraint TO $sv;
-	GRANT SELECT ON TABLE  pg_catalog.pg_indexes    TO $sv;
-	GRANT SELECT ON TABLE  pg_catalog.pg_proc       TO $sv;
-	GRANT SELECT ON TABLE  pg_catalog.pg_type       TO $sv;
-	EOF
-
 "$tool"/local/adduser "$sv" \
  --disabled-login \
  --disabled-password \
@@ -41,13 +26,35 @@ sudo install -d -m 3771 -o "$sv" -g "$sv" \
  "$home"
 sudo install -d -m 2770 -o "$sv" -g "$sv"-addon \
  "$home"/addon.d
-sudo install -d -m 750 -o "$sv" -g "$sv" \
- "$home"/etc \
- /etc/openerp/"${sv#openerp_}"
 sudo ln -fns \
- /etc/openerp/"${sv#openerp_}" \
+ /etc/openerp \
  "$home"/etc/openerp
 
+while ! sudo -u postgres psql </dev/null
+do sleep 1; done
+"$tool"/local/postgresql-role-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"
+	sudo install -d -m 750 -o "$sv" -g "$sv" \
+	 "$home"/etc \
+	 /etc/openerp/"$db"
+ done
+
+sudo -u postgres psql -AqtX "$sv" <<-EOF
+	\set ON_ERROR_STOP on
+	GRANT USAGE  ON SCHEMA pg_catalog               TO $sv;
+	GRANT SELECT ON TABLE  pg_catalog.pg_attribute  TO $sv;
+	GRANT SELECT ON TABLE  pg_catalog.pg_class      TO $sv;
+	GRANT SELECT ON TABLE  pg_catalog.pg_constraint TO $sv;
+	GRANT SELECT ON TABLE  pg_catalog.pg_indexes    TO $sv;
+	GRANT SELECT ON TABLE  pg_catalog.pg_proc       TO $sv;
+	GRANT SELECT ON TABLE  pg_catalog.pg_type       TO $sv;
+	EOF
+
 sudo adduser git   "$sv"-addon
 sudo adduser "$sv" "$sv"-addon
 sudo adduser "$sv" postgres-data
diff --git a/etc/sv/openerp_cyclo_paris_est/log/local.sh b/etc/sv/openerp_cyclofficines/log/local.sh
similarity index 100%
rename from etc/sv/openerp_cyclo_paris_est/log/local.sh
rename to etc/sv/openerp_cyclofficines/log/local.sh
diff --git a/etc/sv/openerp_cyclo_paris_est/log/run b/etc/sv/openerp_cyclofficines/log/run
similarity index 100%
rename from etc/sv/openerp_cyclo_paris_est/log/run
rename to etc/sv/openerp_cyclofficines/log/run
diff --git a/etc/sv/openerp_cyclofficines/run b/etc/sv/openerp_cyclofficines/run
new file mode 100755
index 0000000..f148ab1
--- /dev/null
+++ b/etc/sv/openerp_cyclofficines/run
@@ -0,0 +1,46 @@
+#!/bin/sh -eux
+exec 2>&1
+sv=${PWD#/etc/sv/}
+home=/home/"$sv"
+cd /
+export LOGNAME="$sv"
+ # NOTE: openerp utilise /tmp/oe-sessions-$LOGNAME
+
+for db in \
+ openerp_cyclo_ivry \
+ openerp_cyclo_paris_est
+ do
+	test -e /etc/openerp/"$db"/server.conf ||
+	/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 \
+	 --database="$db" \
+	 --db_host=/run/postgresql \
+	 --db_user="$db" \
+	 --debug \
+	 --init=remembership,pos_membership,bikecoop \
+	 --load-language=fr_FR \
+	 --no-database-list \
+	 --no-xmlrpcs \
+	 --osv-memory-age-limit=0.1 \
+	 --proxy-mode \
+	 --save \
+	 --stop-after-init \
+	 --timezone="$(cat /etc/timezone)" \
+	 --without-demo=base \
+	 --workers=0 \
+	 --xmlrpc-interface=127.0.0.1 \
+	 --xmlrpc-port=8069 \
+	 # NOTE: si --workers > 0
+	 # --limit-memory-hard=$((300 * 1024 * 1024))
+	 # --limit-memory-soft=$((150 * 1024 * 1024))
+ done
+
+exec /usr/bin/chpst \
+ -u "$sv":"$sv":"$sv"-addon:postgres-data \
+ /usr/bin/openerp-server \
+ --config /etc/openerp/"$db"/server.conf \
+ --load-language=fr_FR \
+ #--database="$sv"
-- 
2.20.1