Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1605 from ArthurHoaro/fix/nginx-doc-rule

Browse source 
Fix: nginx - add rule to disable url-rewriting for the docs
This commit is contained in:
ArthurHoaro 2020-10-21 15:55:39 +02:00 committed by GitHub
commit 8f6e3d51cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.docker/nginx.conf
View file

@ -29,7 +29,7 @@ http {
log_not_found off; log_not_found off;
deny all; deny all;
} }
location ~ ~$ { location ~ ~$ {
# deny access to temp editor files, e.g. "script.php~" # deny access to temp editor files, e.g. "script.php~"
access_log off; access_log off;
@ -65,6 +65,11 @@ http {
include fastcgi.conf; include fastcgi.conf;
} }
location ~ /doc/ {
default_type "text/html";
try_files $uri $uri/ $uri.html =404;
}
location ~ \.php$ { location ~ \.php$ {
# deny access to all other PHP scripts # deny access to all other PHP scripts
deny all; deny all;

5
doc/md/Server-configuration.md
View file

@ -325,6 +325,11 @@ server {
deny all; deny all;
} }
location ~ /doc/ {
default_type "text/html";
try_files $uri $uri/ $uri.html =404;
}
location = /favicon.ico { location = /favicon.ico {
# serve the Shaarli favicon from its custom location # serve the Shaarli favicon from its custom location
alias /var/www/shaarli/images/favicon.ico; alias /var/www/shaarli/images/favicon.ico;