Modifications : etc/gitolite

diff --git a/etc/gitolite b/etc/gitolite
index fb455f9..c65c0c4 160000 (submodule)
--- a/etc/gitolite
+++ b/etc/gitolite
@@ -1 +1 @@
-Subproject commit fb455f98cbd3436a6ff62cb0863d2aec51af4408
+Subproject commit c65c0c46108e379f5dbae957187d409bb76eda21

diff --git a/etc/nginx/site.d/burette/http.conf b/etc/nginx/site.d/burette/http.conf
index d091e3d..a275a97 100644 (file)
--- a/etc/nginx/site.d/burette/http.conf
+++ b/etc/nginx/site.d/burette/http.conf
@@ -1,6 +1,8 @@
 server {
        listen 80;
        server_name
+        burette.atelier-etincelle.heureux-cyclage.org
+        burette.atelier-etincelle.org
         burette.atelierdynamo.fr
         burette.autourducycle.heureux-cyclage.org
         burette.bretzselle.heureux-cyclage.org
@@ -19,6 +21,8 @@ server {
         burette.lapetiterennes.heureux-cyclage.org
         burette.lapetiterennes.org
         burette.laptiterustine.heureux-cyclage.org
+        burette.larouelibre.heureux-cyclage.org
+        burette.lechatperche.heureux-cyclage.org
         burette.mig.heureux-cyclage.org
         burette.mobilidees.heureux-cyclage.org
         burette.mobilidees.org
@@ -51,6 +55,8 @@ upstream openerp7_burette {
  }
 map $http_host $burette_dbfilter {
        default                                    "";
+       burette.atelier-etincelle.heureux-cyclage.org "atelieretincelle$";
+       burette.atelier-etincelle.org              "atelieretincelle$";
        burette.atelierdynamo.fr                   "dynamo$";
        burette.autourducycle.heureux-cyclage.org  "autourducycle$";
        burette.bicyclaide.heureux-cyclage.org     "bicyclaide$";
@@ -71,6 +77,8 @@ map $http_host $burette_dbfilter {
        burette.lapetiterennes.heureux-cyclage.org "lapetiterennes$";
        burette.lapetiterennes.org                 "lapetiterennes$";
        burette.laptiterustine.heureux-cyclage.org "laptiterustine$";
+       burette.larouelibre.heureux-cyclage.org    "larouelibre$";
+       burette.lechatperche.heureux-cyclage.org   "lechatperche$";
        burette.mig.heureux-cyclage.org            "heureuxcyclage$";
        burette.mobilidees.heureux-cyclage.org     "mobilidees$";
        burette.mobilidees.org                     "mobilidees$";

diff --git a/etc/nginx/site.d/burette/site.conf b/etc/nginx/site.d/burette/site.conf
index 28c24ca..bb27fd6 100644 (file)
--- a/etc/nginx/site.d/burette/site.conf
+++ b/etc/nginx/site.d/burette/site.conf
@@ -1,4 +1,5 @@
 server_name
+ burette.atelier-etincelle.org
  burette.atelierdynamo.fr
  burette.autourducycle.heureux-cyclage.org
  burette.bretzselle.heureux-cyclage.org
@@ -17,6 +18,8 @@ server_name
  burette.lapetiterennes.heureux-cyclage.org
  burette.lapetiterennes.org
  burette.laptiterustine.heureux-cyclage.org
+ burette.larouelibre.heureux-cyclage.org
+ burette.lechatperche.heureux-cyclage.org
  burette.mig.heureux-cyclage.org
  burette.mobilidees.heureux-cyclage.org
  burette.mobilidees.org

diff --git a/etc/postgresql/9.1/main/pg_hba.conf b/etc/postgresql/9.1/main/pg_hba.conf
index 12705b8..7073125 100644 (file)
--- a/etc/postgresql/9.1/main/pg_hba.conf
+++ b/etc/postgresql/9.1/main/pg_hba.conf
@@ -1,6 +1,7 @@
 # CONNECTION  DATABASE                          USER                     AUTH      OPTIONS
 local         all                               postgres                 peer      map=admin
 local         all                               backup                   peer
+local         openerp7_burette_atelierletincelle openerp7_burette         peer
 local         openerp7_burette_autourducycle    openerp7_burette         peer
 local         openerp7_burette_bretzselle       openerp7_burette         peer
 local         openerp7_burette_changedechaine   openerp7_burette         peer
@@ -16,6 +17,8 @@ local         openerp7_burette_heureuxcyclage   openerp7_burette         peer
 local         openerp7_burette_labecaneajules   openerp7_burette         peer
 local         openerp7_burette_lapetiterennes   openerp7_burette         peer
 local         openerp7_burette_laptiterustine   openerp7_burette         peer
+local         openerp7_burette_larouelibre      openerp7_burette         peer
+local         openerp7_burette_lechatperche     openerp7_burette         peer
 local         openerp7_burette_mobilidees       openerp7_burette         peer
 local         openerp7_burette_ohcyclo          openerp7_burette         peer
 local         openerp7_burette_ptitvelo         openerp7_burette         peer

diff --git a/etc/sv/openerp7_burette/local.sh b/etc/sv/openerp7_burette/local.sh
index 9d05b44..4127108 100644 (file)
--- a/etc/sv/openerp7_burette/local.sh
+++ b/etc/sv/openerp7_burette/local.sh
@@ -38,6 +38,7 @@ while ! sudo -u postgres psql </dev/null
 do sleep 1; done
 "$tool"/local/postgresql-user-create "$sv"
 for db in \
+       atelieretincelle \
        autourducycle \
        bretzselle \
        changedechaine \
@@ -53,6 +54,8 @@ for db in \
        labecaneajules \
        lapetiterennes \
        laptiterustine \
+       larouelibre \
+       lechatperche \
        mobilidees \
        ohcyclo \
        ptitvelo \
@@ -85,6 +88,7 @@ sudo adduser "$sv" "$sv"-addon
 sudo adduser "$sv" postgres-data
 
 for addon in \
+       atelieretincelle \
        bikecoop \
        bikecoop_l10n_fr \
        bikecoop_translations \
@@ -99,6 +103,8 @@ for addon in \
        eturecup \
        lapetiterennes \
        laptiterustine \
+       larouelibre \
+       lechatperche \
        lhc \
        no_db_management \
        ohcyclo \

diff --git a/etc/sv/openerp7_burette/run b/etc/sv/openerp7_burette/run
index cd6ef19..51077ee 100755 (executable)
--- a/etc/sv/openerp7_burette/run
+++ b/etc/sv/openerp7_burette/run
@@ -26,6 +26,7 @@ export LOGNAME="$sv"
        EOF
 
 for db in \
+ atelieretincelle \
  autourducycle \
  bretzselle \
  changedechaine \
@@ -37,6 +38,8 @@ for db in \
  dynamo \
  labecaneajules \
  laptitrustine \
+ larouelibre \
+ lechatperche \
  mobilidees \
  ohcyclo \
  ptitvelo \