Ajout : etc/nginx/conf.d/letsencrypt.conf

[lhc/admin.git] / srv / ateliers / etc / nginx / org / heureux-cyclage / burettes / server.conf.m4

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 (file)
--- 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_.*$";