X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Flhc-www%2Fsite.conf;h=6c3729c1ee8d92acbf90cc3ccd73a33b26a0a8e5;hb=43bad71e0d705177f617c51bf8ccc3b3b418a7e7;hp=13786a66b744639da283293652654ee0d782039a;hpb=5c42a4d606c3fb4de3420b220d45077b08f13a40;p=lhc%2Fateliers.git

diff --git a/etc/nginx/site.d/lhc-www/site.conf b/etc/nginx/site.d/lhc-www/site.conf
index 13786a6..6c3729c 100644
--- a/etc/nginx/site.d/lhc-www/site.conf
+++ b/etc/nginx/site.d/lhc-www/site.conf
@@ -1,50 +1,27 @@
-server_name www.heureux-cyclage.org heureux-cyclage.org;
+server_name
+    www.heureux-cyclage.org
+    heureux-cyclage.org
+    devel.heureux-cyclage.org;
+root /home/www/data/lhc-www/www;
+index index.php;
 
 client_body_buffer_size 8k;
 client_max_body_size 10m;
-location / {
-	index index.html index.htm index.php;
- }
-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 ~^/(tmp|config)/{
+	return 403;
+}
 location ~ \.php$ {
 	include /etc/nginx/conf.d/fastcgi.conf;
-	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_index  index.php ;
 	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)(/.+)$;
-	
+
 	fastcgi_pass unix:/run/php5/fpm/lhc_www;
- }
+}
+error_page 404 = @spip;
 
+location @spip {
+	rewrite ^/(.*)(\.html)?$  /spip.php?url_propre=$1&$args last;
+}
 # vim: ft=sh