From db40603133d1fcd6f11887d5cd13180433f054c5 Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Fri, 20 Mar 2015 13:05:14 +0100 Subject: [PATCH] =?utf8?q?Corrections=C2=A0:=20=20=20=20=20=20=20=20=20etc?= =?utf8?q?/nginx/org/heureux-cyclage/www?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../etc/nginx/org/heureux-cyclage/www/common.conf.m4 | 3 +-- .../etc/nginx/org/heureux-cyclage/www/server.conf.m4 | 12 ++++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/srv/ateliers/etc/nginx/org/heureux-cyclage/www/common.conf.m4 b/srv/ateliers/etc/nginx/org/heureux-cyclage/www/common.conf.m4 index 89f972e..2fe799c 100644 --- a/srv/ateliers/etc/nginx/org/heureux-cyclage/www/common.conf.m4 +++ b/srv/ateliers/etc/nginx/org/heureux-cyclage/www/common.conf.m4 @@ -1,6 +1,5 @@ server_name - www.heureux-cyclage.org - heureux-cyclage.org; + www.heureux-cyclage.org; root /home/www/data/lhc-www/www; index index.php; diff --git a/srv/ateliers/etc/nginx/org/heureux-cyclage/www/server.conf.m4 b/srv/ateliers/etc/nginx/org/heureux-cyclage/www/server.conf.m4 index 45f349c..5ef111f 100644 --- a/srv/ateliers/etc/nginx/org/heureux-cyclage/www/server.conf.m4 +++ b/srv/ateliers/etc/nginx/org/heureux-cyclage/www/server.conf.m4 @@ -3,8 +3,6 @@ define(`SITE',`DOMAIN/www')dnl server { listen 80; include /etc/nginx/SITE/common.conf; - - return 301 http://www.heureux-cyclage.org$request_uri; } server { listen 443; @@ -13,3 +11,13 @@ server { ssl_certificate /etc/nginx/DOMAIN/crt.pem; ssl_certificate_key /etc/nginx/DOMAIN/key.pem; } +server { + server_name heureux-cyclage.org; + listen 80; + return 301 http://www.heureux-cyclage.org$request_uri; + } +server { + server_name heureux-cyclage.org; + listen 443; + return 301 https://www.heureux-cyclage.org$request_uri; +} -- 2.20.1