From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Sun, 17 Jan 2016 09:06:12 +0000 (+0100)
Subject: Modifications :         etc/nginx/nginx.conf - Compatibilité avec la
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=44afb6a620607d6ca58d52047eccacd64b483fa9

Modifications :         etc/nginx/nginx.conf - Compatibilité avec la
version de lib/tool/admin
Modifications :         etc/php5/fpm/php-fpm.conf - Pareil
---

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