X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fnginx%2Fnginx.conf;h=94c1ffeb9bdf187e10466ed99640825ad0ad00c5;hb=e57c2cb3aaf57656db0f617ed78848dbbcf93d6a;hp=ad979c3a479c892e89a6f5db78d11ccf91e48a80;hpb=a60a77e4b97f276d26b53e2b94561ab70083e986;p=lhc%2Fateliers.git

diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf
index ad979c3..94c1ffe 100644
--- a/etc/nginx/nginx.conf
+++ b/etc/nginx/nginx.conf
@@ -9,6 +9,16 @@ http {
 	 '$remote_addr - $remote_user [$time_local] "$request" '
 	 '$status $body_bytes_sent "$http_referer" '
 	 '"$http_user_agent" "$http_x_forwarded_for"';
+	log_format piwik
+	 '{"ip": "$remote_addr",'
+	 '"host": "$host",'
+	 '"path": "$request_uri",'
+	 '"status": "$status",'
+	 '"referrer": "$http_referer",'
+	 '"user_agent": "$http_user_agent",'
+	 '"length": $bytes_sent,'
+	 '"generation_time_milli": $request_time,'
+	 '"date": "$time_iso8601"}';
 	access_log /var/log/nginx/access.log main buffer=32k;
 	client_body_buffer_size 4K;
 		# NOTE: % getconf PAGESIZE
@@ -100,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  _;
@@ -110,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;