From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Tue, 20 Sep 2016 15:41:55 +0000 (+0200)
Subject: Modifications :         etc/nginx/org/chatperche/www/server.conf.m4
X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fadmin.git;a=commitdiff_plain;h=a6176abb562ff717f95a0bd7e361b4ba5c09db0d

Modifications :         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
--- 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;
 }