summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2019-08-31 16:04:29 +0200
committerJohannes Löthberg <johannes@kyriasis.com>2019-08-31 16:04:29 +0200
commit53ce4b5da18a2e9e316fbea4651b6d892096883d (patch)
treea574c8eb4c9b740f4f94693edf61760338aa96a9
parentf226c921b460240d2cee864788302d80b6cbecbb (diff)
downloadpillar-53ce4b5da18a2e9e316fbea4651b6d892096883d.tar.xz
xan: Named locations only allowed at server level
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
-rw-r--r--nginx/xan_kyriasis_com.sls6
1 files changed, 3 insertions, 3 deletions
diff --git a/nginx/xan_kyriasis_com.sls b/nginx/xan_kyriasis_com.sls
index 0168f4e..6a21d5f 100644
--- a/nginx/xan_kyriasis_com.sls
+++ b/nginx/xan_kyriasis_com.sls
@@ -51,14 +51,14 @@ nginx:
- client_body_timeout: 60
+ - location @mediawiki:
+ - rewrite: '^/wiki([^?]*)(?:\?(.*))? /index.php5?title=$1&$2 last;'
+
- location /wiki:
- root: /usr/share/webapps/xans-wiki
- index: index.php index.html
- try_files: $uri $uri/ @mediawiki
- - location @mediawiki:
- - rewrite: '^/wiki([^?]*)(?:\?(.*))? /index.php5?title=$1&$2 last;'
-
- location ~ \.php$:
- include: fastcgi.conf
- fastcgi_pass: unix:/var/run/php-fpm/php-fpm.sock