From 6f148ca6b490cc5251e9ac41595514b7509639bd Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Thu, 2 Apr 2015 12:46:28 +0200 Subject: [PATCH] =?utf8?q?Corrections=C2=A0:=20=20=20=20=20=20=20=20=20etc?= =?utf8?q?/nginx/org/changedechaine/www?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../etc/nginx/org/changedechaine/www/common.conf.m4 | 6 ++---- .../etc/nginx/org/changedechaine/www/server.conf.m4 | 10 +++------- 2 files changed, 5 insertions(+), 11 deletions(-) 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; - } } -- 2.20.1