From 25b7795fee2a655dfd6dbedcb1233b7dddb9f3fb Mon Sep 17 00:00:00 2001
From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Tue, 17 Dec 2013 10:17:33 +0100
Subject: [PATCH] Ajout: burettes en masse

---
 etc/nginx/site.d/burette/http.conf          | 16 +++++++++++++++-
 etc/nginx/site.d/burette/site.conf          |  7 +++++++
 etc/nsd3/zone.d/heureux-cyclage.org.zone.m4 |  7 +++++++
 etc/sv/openerp7_burette/local.sh            |  7 +++++++
 etc/sv/openerp7_burette/run                 |  8 ++++++++
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/etc/nginx/site.d/burette/http.conf b/etc/nginx/site.d/burette/http.conf
index a0d1cf7..fefa960 100644
--- a/etc/nginx/site.d/burette/http.conf
+++ b/etc/nginx/site.d/burette/http.conf
@@ -3,13 +3,20 @@ server {
 	server_name
 	 burettes.heureux-cyclage.org
 	 burette.atelierdynamo.fr
+	 burette.autourducycle.heureux-cyclage.org
 	 burette.cyclocoop.heureux-cyclage.org
 	 burette.cyclocoop.org
+	 burette.cyclofficineangouleme.heureux-cyclage.org
 	 burette.dynamo.heureux-cyclage.org
+	 burette.labecaneajules.heureux-cyclage.org
+	 burette.ohcyclo.heureux-cyclage.org
 	 burette.ptitvelo.heureux-cyclage.org
 	 burette.ptitvelo.net
+	 burette.repeyre.heureux-cyclage.org
+	 burette.txirrindola.heureux-cyclage.org
 	 burette.velorution.org
 	 burette.velorution_idf.heureux-cyclage.org
+	 burette.velorution_toulouse.heureux-cyclage.org
 	 burette.velosenville.org
 	 burette.vieuxbiclou.heureux-cyclage.org
 	 burette.vieuxbiclou.org;
@@ -23,17 +30,24 @@ upstream openerp7_burette {
  }
 map $http_host $burette_dbfilter {
 	default                                    "";
-	burettes.heureux-cyclage.org               ".*$";
 	burette.atelierdynamo.fr                   "dynamo$";
+	burette.autourducycle.heureux-cyclage.org  "autourducycle$";
 	burette.cyclocoop.heureux-cyclage.org      "cyclo_.*$";
 	burette.cyclocoop.org                      "cyclo_.*$";
+	burette.cyclofficineangouleme.heureux-cyclage.org "cyclofficine_angouleme$";
 	burette.dynamo.heureux-cyclage.org         "dynamo$";
+	burette.labecaneajules.heureux-cyclage.org "labecaneajules$";
+	burette.ohcyclo.heureux-cyclage.org        "ohcyclo$";
 	burette.ptitvelo.heureux-cyclage.org       "ptitvelo$";
 	burette.ptitvelo.net                       "ptitvelo$";
+	burette.repeyre.heureux-cyclage.org        "repeyre$";
+	burette.txirrindola.heureux-cyclage.org    "txirrindola$";
 	burette.velorution.org                     "velorution_idf$";
 	burette.velorution_idf.heureux-cyclage.org "velorution_idf$";
+	burette.velorution_toulouse.heureux-cyclage.org "velorution_toulouse$";
 	burette.velosenville.heureux-cyclage.org   "velosenville$";
 	burette.velosenville.org                   "velosenville$";
 	burette.vieuxbiclou.heureux-cyclage.org    "vieuxbiclou$";
 	burette.vieuxbiclou.org                    "vieuxbiclou$";
+	burettes.heureux-cyclage.org               ".*$";
  }
diff --git a/etc/nginx/site.d/burette/site.conf b/etc/nginx/site.d/burette/site.conf
index ed68b6e..c987e7d 100644
--- a/etc/nginx/site.d/burette/site.conf
+++ b/etc/nginx/site.d/burette/site.conf
@@ -1,13 +1,20 @@
 server_name
  burettes.heureux-cyclage.org
  burette.atelierdynamo.fr
+ burette.autourducycle.heureux-cyclage.org
  burette.cyclocoop.heureux-cyclage.org
  burette.cyclocoop.org
+ burette.cyclofficineangouleme.heureux-cyclage.org
  burette.dynamo.heureux-cyclage.org
+ burette.labecaneajules.heureux-cyclage.org
+ burette.ohcyclo.heureux-cyclage.org
  burette.ptitvelo.heureux-cyclage.org
  burette.ptitvelo.net
+ burette.repeyre.heureux-cyclage.org
+ burette.txirrindola.heureux-cyclage.org
  burette.velorution.org
  burette.velorution_idf.heureux-cyclage.org
+ burette.velorutiontoulouse.heureux-cyclage.org
  burette.velosenville.org
  burette.vieuxbiclou.heureux-cyclage.org
  burette.vieuxbiclou.org;
diff --git a/etc/nsd3/zone.d/heureux-cyclage.org.zone.m4 b/etc/nsd3/zone.d/heureux-cyclage.org.zone.m4
index dc868f6..ca4ff24 100644
--- a/etc/nsd3/zone.d/heureux-cyclage.org.zone.m4
+++ b/etc/nsd3/zone.d/heureux-cyclage.org.zone.m4
@@ -41,9 +41,16 @@ ateliers             A IP4(GRESILLE)
 autoconfig           A IP4(GRESILLE)
 bicloud              A IP4(GRESILLE)
 burette              A IP4(GRESILLE)
+burette.autourducycle  A IP4(GRESILLE)
 burette.cyclocoop    A IP4(GRESILLE)
+burette.cyclofficineangouleme A IP4(GRESILLE)
 burette.dynamo       A IP4(GRESILLE)
+burette.labecaneajules A IP4(GRESILLE)
+burette.ohcyclo      A IP4(GRESILLE)
 burette.ptitvelo     A IP4(GRESILLE)
+burette.repeyre      A IP4(GRESILLE)
+burette.txirrindola  A IP4(GRESILLE)
+burette.velorutiontoulouse    A IP4(GRESILLE)
 burette.velosenville A IP4(GRESILLE)
 burettes             A IP4(GRESILLE)
 caldavzap            A IP4(GRESILLE)
diff --git a/etc/sv/openerp7_burette/local.sh b/etc/sv/openerp7_burette/local.sh
index c66dc43..260c31b 100644
--- a/etc/sv/openerp7_burette/local.sh
+++ b/etc/sv/openerp7_burette/local.sh
@@ -38,12 +38,19 @@ while ! sudo -u postgres psql </dev/null
 do sleep 1; done
 "$tool"/local/postgresql-user-create "$sv"
 for db in \
+	autourducycle \
+	labecaneajules \
 	cyclo_ivry \
 	cyclo_pantin \
 	cyclo_paris_est \
+	cyclofficine_angouleme \
 	dynamo \
+	ohcyclo \
 	ptitvelo \
+	repeyre \
+	txirrindola \
 	velorution_idf \
+	velorution_toulouse \
 	velosenville \
 	vieuxbiclou
  do
diff --git a/etc/sv/openerp7_burette/run b/etc/sv/openerp7_burette/run
index 1d4250c..b658341 100755
--- a/etc/sv/openerp7_burette/run
+++ b/etc/sv/openerp7_burette/run
@@ -26,12 +26,20 @@ export LOGNAME="$sv"
 	EOF
 
 for db in \
+ autourducycle \
+ cyclo_ivry \
  cyclo_ivry \
  cyclo_pantin \
  cyclo_paris_est \
+ cyclofficine_angouleme \
  dynamo \
+ labecaneajules \
+ ohcyclo \
  ptitvelo \
+ repeyre \
+ txirrindola \
  velorution_idf \
+ velorution_toulouse \
  velosenville \
  vieuxbiclou
  do
-- 
2.20.1