Modifications: etc/nginx/org/heureux-cyclage/clavette-lyon/common.conf.m4

diff --git a/srv/ateliers/etc/nginx/org/heureux-cyclage/clavette-lyon/common.conf.m4 b/srv/ateliers/etc/nginx/org/heureux-cyclage/clavette-lyon/common.conf.m4
index 9b16f15..20b8000 100644 (file)
--- a/srv/ateliers/etc/nginx/org/heureux-cyclage/clavette-lyon/common.conf.m4
+++ b/srv/ateliers/etc/nginx/org/heureux-cyclage/clavette-lyon/common.conf.m4
@@ -1,28 +1,56 @@
 server_name
     clavette-lyon.heureux-cyclage.org;
 root /home/www/data/org/heureux-cyclage/clavette-lyon/www/;
-index index.php;
 
-client_body_buffer_size 8k;
-client_max_body_size 10m;
-
-location ~^/(tmp|config)/{
-       return 403;
-}
-location ~ \.html$ {
+rewrite /wp-admin$ $scheme://$host$uri/ permanent;
+       # Add trailing slash to */wp-admin requests.
+location = /wp-admin/ {
+       return 301 /wp-admin/index.php?$args;
+ }
+location / {
+       index index.html index.htm index.php;
+       try_files $uri $uri/ /index.php?$args;
+ }
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+       access_log off;
+       expires 30d;
+       log_not_found off;
+ }
+location ~ /\. {
+       access_log off;
+       deny all;
        log_not_found off;
-}
-location ~ \.php$ {
+ }
+location ~ \.php(|/.+)$ {
        include /etc/nginx/conf.d/fastcgi.conf;
-       fastcgi_index  index.php ;
+       set $no_cache "0";
+       if ($request_method !~ ^(GET|HEAD)$) {
+        # NOTE: if non GET/HEAD, don't cache and mark user as uncacheable for 1 second via cookie.
+               set $no_cache "1";
+        }
+       if ($no_cache = "1") {
+        # NOTE: drop no cache cookie if need be (for some reason, add_header fails if included in prior if-block).
+               add_header Set-Cookie "_mcnc=1; Max-Age=2; Path=/";
+               add_header X-Microcachable "0";
+        }
+       if ($http_cookie ~* "_mcnc") {
+        # NOTE: bypass cache if no-cache cookie is set
+               set $no_cache "1";
+        }
+       fastcgi_cache_bypass $no_cache;
+       fastcgi_cache_use_stale updating;
+       fastcgi_cache_valid 200 10s;
+       fastcgi_cache_valid 404 10m;
+       fastcgi_ignore_headers Cache-Control Expires Set-Cookie;
+       fastcgi_index index.php;
+       fastcgi_no_cache $no_cache;
        fastcgi_param REDIRECT_STATUS 200;
+               # NOTE: PHP only, required if PHP was built with --enable-force-cgi-redirect
+       fastcgi_pass_header Cookie;
+       fastcgi_pass_header Set-Cookie;
        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-
+       try_files $fastcgi_script_name =404;
+               # Check for path info security issue
        fastcgi_pass unix:CAT(sys/php5/fpm/org/heureux-cyclage/clavette-lyon/socket);
-}
-error_page 404 = @spip;
-
-location @spip {
-       rewrite ^/(.*)(\.html)?$  /spip.php?url_propre=$1&$args last;
-}
+ }
 # vim: ft=sh