diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-21 15:23:30 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-10-21 15:23:30 +0200 |
commit | 2f87bfdc69052cd64e84b1d2b97a0af14991a385 (patch) | |
tree | 99fa3d8862a79148abd18203c6cc45175b356b3a | |
parent | d8030c8155ee4c20573848b2444f6df0b65d1662 (diff) | |
download | Shaarli-2f87bfdc69052cd64e84b1d2b97a0af14991a385.tar.gz Shaarli-2f87bfdc69052cd64e84b1d2b97a0af14991a385.tar.zst Shaarli-2f87bfdc69052cd64e84b1d2b97a0af14991a385.zip |
Fix: nginx - add rule to disable url-rewriting for the docs
Related to #1603
-rw-r--r-- | .docker/nginx.conf | 7 | ||||
-rw-r--r-- | doc/md/Server-configuration.md | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.docker/nginx.conf b/.docker/nginx.conf index 07fba33f..023f52c1 100644 --- a/.docker/nginx.conf +++ b/.docker/nginx.conf | |||
@@ -29,7 +29,7 @@ http { | |||
29 | log_not_found off; | 29 | log_not_found off; |
30 | deny all; | 30 | deny all; |
31 | } | 31 | } |
32 | 32 | ||
33 | location ~ ~$ { | 33 | location ~ ~$ { |
34 | # deny access to temp editor files, e.g. "script.php~" | 34 | # deny access to temp editor files, e.g. "script.php~" |
35 | access_log off; | 35 | access_log off; |
@@ -65,6 +65,11 @@ http { | |||
65 | include fastcgi.conf; | 65 | include fastcgi.conf; |
66 | } | 66 | } |
67 | 67 | ||
68 | location ~ /doc/ { | ||
69 | default_type "text/html"; | ||
70 | try_files $uri $uri/ $uri.html =404; | ||
71 | } | ||
72 | |||
68 | location ~ \.php$ { | 73 | location ~ \.php$ { |
69 | # deny access to all other PHP scripts | 74 | # deny access to all other PHP scripts |
70 | deny all; | 75 | deny all; |
diff --git a/doc/md/Server-configuration.md b/doc/md/Server-configuration.md index 8cb39934..4e74d80b 100644 --- a/doc/md/Server-configuration.md +++ b/doc/md/Server-configuration.md | |||
@@ -325,6 +325,11 @@ server { | |||
325 | deny all; | 325 | deny all; |
326 | } | 326 | } |
327 | 327 | ||
328 | location ~ /doc/ { | ||
329 | default_type "text/html"; | ||
330 | try_files $uri $uri/ $uri.html =404; | ||
331 | } | ||
332 | |||
328 | location = /favicon.ico { | 333 | location = /favicon.ico { |
329 | # serve the Shaarli favicon from its custom location | 334 | # serve the Shaarli favicon from its custom location |
330 | alias /var/www/shaarli/images/favicon.ico; | 335 | alias /var/www/shaarli/images/favicon.ico; |