aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-07-25 10:19:19 +0200
committerMario Vavti <mario@mariovavti.com>2018-07-25 10:19:19 +0200
commit1b1d11dcf1091158232e98abad966d4900e2ccc9 (patch)
tree380d5e04c73391089bf3d658ea4b27eecffa4916 /install
parentb655d04b3474893ee3dea99b77f2e7dd764729a0 (diff)
parent35200e5f1b10cdd18af8f0ea646996e438b97011 (diff)
downloadvolse-hubzilla-1b1d11dcf1091158232e98abad966d4900e2ccc9.tar.gz
volse-hubzilla-1b1d11dcf1091158232e98abad966d4900e2ccc9.tar.bz2
volse-hubzilla-1b1d11dcf1091158232e98abad966d4900e2ccc9.zip
Merge branch '3.6RC'
Diffstat (limited to 'install')
-rw-r--r--install/sample-nginx.conf19
1 files changed, 11 insertions, 8 deletions
diff --git a/install/sample-nginx.conf b/install/sample-nginx.conf
index 4121ff2ec..839f208ae 100644
--- a/install/sample-nginx.conf
+++ b/install/sample-nginx.conf
@@ -73,29 +73,32 @@ server {
client_max_body_size 20m;
client_body_buffer_size 128k;
+ include mime.types;
+
# rewrite to front controller as default rule
location / {
- if ($is_args != "") {
- rewrite ^/(.*) /index.php?q=$uri&$args last;
+ if (!-e $request_filename) {
+ rewrite ^(.*)$ /index.php?q=$1;
}
- rewrite ^/(.*) /index.php?q=$uri last;
}
# make sure webfinger and other well known services aren't blocked
# by denying dot files and rewrite request to the front controller
location ^~ /.well-known/ {
allow all;
- rewrite ^/(.*) /index.php?q=$uri&$args last;
+ if (!-e $request_filename) {
+ rewrite ^(.*)$ /index.php?q=$1;
+ }
}
# statically serve these file types when possible
# otherwise fall back to front controller
# allow browser to cache them
# added .htm for advanced source code editor library
- location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ {
- expires 30d;
- try_files $uri /index.php?q=$uri&$args;
- }
+ # location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ {
+ # expires 30d;
+ # try_files $uri /index.php?q=$uri&$args;
+ # }
# block these file types
location ~* \.(tpl|md|tgz|log|out)$ {