X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=srv%2Fateliers%2Fetc%2Fnginx%2Forg%2Fheureux-cyclage%2Fburettes%2Fserver.conf.m4;h=803c436433936df9c8a756f0eb1528a4286bcd4e;hb=ea6b93ffbab9d1bb47faa0110a118f39f4e9023e;hp=1c7cbe270b780d4f0ab1c0169e22b045dc63eea9;hpb=4877e9ca5938c14e8c1bd80c2528b2cc1c1c9e1d;p=lhc%2Fadmin.git

diff --git a/srv/ateliers/etc/nginx/org/heureux-cyclage/burettes/server.conf.m4 b/srv/ateliers/etc/nginx/org/heureux-cyclage/burettes/server.conf.m4
index 1c7cbe2..803c436 100644
--- a/srv/ateliers/etc/nginx/org/heureux-cyclage/burettes/server.conf.m4
+++ b/srv/ateliers/etc/nginx/org/heureux-cyclage/burettes/server.conf.m4
@@ -2,8 +2,11 @@ define(`DOMAIN',`org/heureux-cyclage')dnl
 define(`SITE',`DOMAIN/burettes')dnl
 server {
 	listen 80;
+	include /etc/nginx/conf.d/letsencrypt.conf;
 	include /etc/nginx/org/heureux-cyclage/burettes/name.conf;
-	return 301 https://$host$request_uri;
+	location / {
+		return 301 https://$host$request_uri;
+	}
  }
 server {
 	listen 443;
@@ -31,6 +34,8 @@ map $http_host $burette_dbfilter {
 	burette.bretzselle.org                     "bretzselle$";
 	burette.changedechaine.heureux-cyclage.org "changedechaine$";
 	burette.convibicy.heureux-cyclage.org      "convibicy$";
+	burette.convibicy.fr                       "convibicy$";
+	burette.cyclamaine.fr                      "cyclamaine$";
 	burette.cyclamaine.heureux-cyclage.org     "cyclamaine$";
 	burette.cyclesetmanivelles.heureux-cyclage.org "cyclesetmanivelles$";
 	burette.cyclocoop.heureux-cyclage.org      "cyclo_.*$";