Skip to content

Commit 4f569df

Browse files
committed
Cleanup default site conf
Signed-off-by: Eric Nemchik <eric@nemchik.com>
1 parent 92901fa commit 4f569df

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ app_setup_block: |
113113
114114
# changelog
115115
changelogs:
116+
- { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
116117
- { date: "31.10.23:", desc: "Further sanitize sed replace." }
117118
- { date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support." }
118119
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }

root/defaults/nginx/site-confs/default.conf.sample

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample
1+
## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample
22

33
server {
44
listen 80 default_server;
@@ -19,11 +19,16 @@ server {
1919
#auth_basic "Restricted";
2020
#auth_basic_user_file /config/nginx/.htpasswd;
2121

22-
try_files $uri $uri/ /index.php$is_args$args;
22+
try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args;
2323
}
2424

2525
location ~ ^(.+\.php)(.*)$ {
26+
# enable the next two lines for http auth
27+
#auth_basic "Restricted";
28+
#auth_basic_user_file /config/nginx/.htpasswd;
29+
2630
fastcgi_split_path_info ^(.+\.php)(.*)$;
31+
if (!-f $document_root$fastcgi_script_name) { return 404; }
2732
fastcgi_pass 127.0.0.1:9000;
2833
fastcgi_index index.php;
2934
include /etc/nginx/fastcgi_params;

0 commit comments

Comments
 (0)