From 44afb6a620607d6ca58d52047eccacd64b483fa9 Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Sun, 17 Jan 2016 10:06:12 +0100 Subject: [PATCH] =?utf8?q?Modifications=C2=A0:=20=20=20=20=20=20=20=20=20e?= =?utf8?q?tc/nginx/nginx.conf=20-=20Compatibilit=C3=A9=20avec=20la=20versi?= =?utf8?q?on=20de=20lib/tool/admin=20Modifications=C2=A0:=20=20=20=20=20?= =?utf8?q?=20=20=20=20etc/php5/fpm/php-fpm.conf=20-=20Pareil?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- etc/nginx/nginx.conf | 9 +++++---- etc/php5/fpm/php-fpm.conf | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf index 70aed2c..94c1ffe 100644 --- a/etc/nginx/nginx.conf +++ b/etc/nginx/nginx.conf @@ -110,7 +110,8 @@ http { 127.0.0.1 0; } include /etc/nginx/site.d/*/http.conf; - include /etc/nginx/site.d/*/server.conf; + include /etc/nginx/*/*/server.conf; + include /etc/nginx/*/*/*/server.conf; server { listen 80 default_server; server_name _; @@ -120,9 +121,9 @@ http { listen 443 default_server; server_name _; include /etc/nginx/conf.d/ssl.conf; - ssl_certificate /etc/nginx/x509.d/cyclo-www-tls/crt.pem; - ssl_certificate_key /etc/nginx/x509.d/cyclo-www-tls/key.pem; - return 302 $scheme://cyclocoop.org$request_uri; + ssl_certificate /etc/nginx/org/heureux-cyclage/crt.pem; + ssl_certificate_key /etc/nginx/org/heureux-cyclage/key.pem; + return 302 $scheme://heureux-cyclage.org$request_uri; } } pid /run/nginx.pid; diff --git a/etc/php5/fpm/php-fpm.conf b/etc/php5/fpm/php-fpm.conf index 58207d5..da642a2 100644 --- a/etc/php5/fpm/php-fpm.conf +++ b/etc/php5/fpm/php-fpm.conf @@ -14,3 +14,4 @@ syslog.facility = daemon syslog.ident = php5-fpm include=/etc/php5/fpm/pool.d/*/php-fpm.conf +include=/etc/php5/fpm/*/*/*/php-fpm.conf -- 2.20.1