X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Flhc-wiklou%2Fsite.conf;h=5af107442bf73e32aa78e6381ec039a4abf2a0f8;hb=c819716f6d45c705b7c651b24982ac22cf2b029d;hp=f01b4602882ac220ed9a690003cb5d17a758a528;hpb=480d4d3e53108c271ebafdb5cbf4efbbbf5a87fb;p=lhc%2Fateliers.git

diff --git a/etc/nginx/site.d/lhc-wiklou/site.conf b/etc/nginx/site.d/lhc-wiklou/site.conf
index f01b460..5af1074 100644
--- a/etc/nginx/site.d/lhc-wiklou/site.conf
+++ b/etc/nginx/site.d/lhc-wiklou/site.conf
@@ -8,15 +8,13 @@ client_max_body_size 10m;
 
 location / {
 	# Do this inside of a location so it can be negated
+	rewrite  ^/index.php/(.*)$  /wiki/$1  permanent;
 	location ~ \.php$ {
 		try_files $uri $uri/ =404; # Don't let php execute non-existent php files
-		rewrite  ^/index.php/(.*)$  /wiki/$1  permanent;
 		fastcgi_split_path_info ^(.+\.php)(/.+)$;
 		fastcgi_pass unix:/run/php5/fpm/lhc_wiklou;
 		fastcgi_index  index.php ;
-		fastcgi_buffers 16 16k;
-		fastcgi_buffer_size 32k;
-		include fastcgi_params;
+		include /etc/nginx/conf.d/fastcgi.conf;
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 	}
 }
@@ -54,15 +52,12 @@ location ~ /.ht { deny all; }
 
 # Handling for the article path
 location /wiki {
-	include /etc/nginx/fastcgi_params;
+	include /etc/nginx/conf.d/fastcgi.conf;
 	# article path should always be passed to index.php
 	fastcgi_param SCRIPT_FILENAME	$document_root/index.php;
 	fastcgi_split_path_info ^(.+\.php)(/.+)$;
 	fastcgi_pass unix:/run/php5/fpm/lhc_wiklou;
 	fastcgi_index  index.php ;
-	fastcgi_buffers 16 16k;
-	fastcgi_buffer_size 32k;
-	include fastcgi_params;
 }
 
 # Thumbnail 404 handler, only called by try_files when a thumbnail does not exist
@@ -72,7 +67,7 @@ location @thumb {
 	rewrite ^/images/thumb/archive/[0-9a-f]/[0-9a-f][0-9a-f]/([^/]+)/([0-9]+)px-.*$ /thumb.php?f=$1&width=$2&archived=1;
 	
 	# Run the thumb.php script
-	include /etc/nginx/fastcgi_params;
+	include /etc/nginx/conf.d/fastcgi.conf;
 	fastcgi_param SCRIPT_FILENAME	$document_root/thumb.php;
 	fastcgi_pass unix:/run/php5/fpm/lhc_wiklou;
 }