From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Thu, 2 Apr 2015 10:46:28 +0000 (+0200)
Subject: Corrections :         etc/nginx/org/changedechaine/www
X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fadmin.git;a=commitdiff_plain;h=6f148ca6b490cc5251e9ac41595514b7509639bd

Corrections :         etc/nginx/org/changedechaine/www
---

diff --git a/srv/ateliers/etc/nginx/org/changedechaine/www/common.conf.m4 b/srv/ateliers/etc/nginx/org/changedechaine/www/common.conf.m4
index 9f53e01..e090005 100644
--- a/srv/ateliers/etc/nginx/org/changedechaine/www/common.conf.m4
+++ b/srv/ateliers/etc/nginx/org/changedechaine/www/common.conf.m4
@@ -1,8 +1,6 @@
 server_name
-    changedechaine.heureux-cyclage.org
-    changedechaine.org
-    futur.changedechaine.org
-    www.changedechaine.org;
+    www.changedechaine.org
+    changedechaine.heureux-cyclage.org;
 root /home/www/data/org/changedechaine/www;
 
 rewrite /wp-admin$ $scheme://$host$uri/ permanent;
diff --git a/srv/ateliers/etc/nginx/org/changedechaine/www/server.conf.m4 b/srv/ateliers/etc/nginx/org/changedechaine/www/server.conf.m4
index 0098f14..4e8c357 100644
--- a/srv/ateliers/etc/nginx/org/changedechaine/www/server.conf.m4
+++ b/srv/ateliers/etc/nginx/org/changedechaine/www/server.conf.m4
@@ -8,13 +8,9 @@ server {
 	error_log  /home/www/log/SITE/error.log warn;
  }
 server {
-	server_name NAME;
+	server_name
+		NAME
+		futur.NAME;
 	listen 80;
 	return 301 http://www.NAME$request_uri;
- }
-server {
-	server_name futur.NAME;
-	listen 80;
-	return 301 http://www.NAME$request_uri;
- }
 }