Correction : openerp_cyclofficines : poursuit la mutualisation.

[lhc/ateliers.git] / etc / sv / openerp_cyclofficines / run

diff --git a/etc/sv/openerp_cyclofficines/run b/etc/sv/openerp_cyclofficines/run
index f148ab1..9269b8e 100755 (executable)
--- 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"
+ "$@"