Modifications : etc/nginx/org/chatperche/www/server.conf.m4

[lhc/admin.git] / srv / ateliers / etc / nginx / org / chatperche / www / server.conf.m4

diff --git a/srv/ateliers/etc/nginx/org/chatperche/www/server.conf.m4 b/srv/ateliers/etc/nginx/org/chatperche/www/server.conf.m4
index 5704d6b..2cbf91e 100644 (file)
--- a/srv/ateliers/etc/nginx/org/chatperche/www/server.conf.m4
+++ b/srv/ateliers/etc/nginx/org/chatperche/www/server.conf.m4
@@ -3,18 +3,14 @@ define(`SITE',`DOMAIN/www')dnl
 define(`NAME',`chatperche.org')dnl
 server {
        listen 80;
+       include /etc/nginx/conf.d/letsencrypt.conf;
+       include /etc/nginx/SITE/common.conf;
        access_log /home/www/log/SITE/access.log main;
        error_log  /home/www/log/SITE/error.log warn;
  }
 server {
        server_name
-               NAME
-               www.NAME;
-       listen 80;
-       return 301 http://ateliervelo.free.fr/;
-}
-server {
-       server_name
-               chatperche.heureux-cyclage.org;
+               NAME;
        listen 80;
+       return 301 http://www.NAME$request_uri;
 }