diff options
| author | Johannes Löthberg <johannes@kyriasis.com> | 2019-08-31 16:02:17 +0200 |
|---|---|---|
| committer | Johannes Löthberg <johannes@kyriasis.com> | 2019-08-31 16:02:17 +0200 |
| commit | f226c921b460240d2cee864788302d80b6cbecbb (patch) | |
| tree | a96736ef638dcf7bc52adda7f45c376589325972 /nginx | |
| parent | 1e931f5ce7a4a3ed37b44ec81855ac8431515e69 (diff) | |
| download | pillar-f226c921b460240d2cee864788302d80b6cbecbb.tar.xz | |
Move xan's wiki under /wiki
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Diffstat (limited to 'nginx')
| -rw-r--r-- | nginx/xan_kyriasis_com.sls | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/nginx/xan_kyriasis_com.sls b/nginx/xan_kyriasis_com.sls index 8cf4a0e..0168f4e 100644 --- a/nginx/xan_kyriasis_com.sls +++ b/nginx/xan_kyriasis_com.sls @@ -47,33 +47,34 @@ nginx: # http://www.gnuterrypratchett.com/ - add_header: 'X-Clacks-Overhead "GNU Terry Pratchett"' - - root: /usr/share/webapps/xans-wiki - - client_max_body_size: 100m - client_body_timeout: 60 - - try_files: $uri $uri/ @mediawiki - - index: index.php index.html - - location @mediawiki: - - rewrite: '^/(.*)$ /index.php?title=$1&$args' + - 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 ~ \.php5?$: - - include: fastcgi.conf - - fastcgi_pass: unix:/var/run/php-fpm/php-fpm.sock - - fastcgi_index: index.php - - try_files: $uri @mediawiki + - location ~ \.php$: + - include: fastcgi.conf + - fastcgi_pass: unix:/var/run/php-fpm/php-fpm.sock + - fastcgi_index: index.php + - try_files: $uri @mediawiki - - location ~* \.(js|css|png|jpg|jpeg|gif|ico)$: - - try_files: $uri /index.php - - expires: max + - location ~* \.(js|css|png|jpg|jpeg|gif|ico)$: + - try_files: $uri /index.php + - expires: max - # Restrictions based on default htaccess file - - location ^~ ^/(cache|includes|maintenance|languages|serialized|tests|images/deleted)/: - - deny: all + # Restrictions based on default htaccess file + - location ^~ ^/(cache|includes|maintenance|languages|serialized|tests|images/deleted)/: + - deny: all - - location ^~ ^/(bin|docs|extensions|includes|maintenance|mw-config|resources|serialized|tests)/: - - internal: '' + - location ^~ ^/(bin|docs|extensions|includes|maintenance|mw-config|resources|serialized|tests)/: + - internal: '' - location /.well-known/acme-challenge: - root: /srv/http/ |