Correction : etc/nsd/zone.d/cyclocoop.org.zone.m4 - Champs SPF

[lhc/ateliers.git] / etc / nginx / nginx.conf

diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf
index ad979c3..94c1ffe 100644 (file)
--- 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;