From 1bf1b17860d0ba380843351260ae1274484c3d91 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 25 Dec 2023 14:18:55 -0600 Subject: [PATCH 1/3] Cleanup default site conf Signed-off-by: Eric Nemchik --- readme-vars.yml | 1 + root/defaults/nginx/site-confs/default.conf.sample | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 9631009..2dc1e65 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -41,6 +41,7 @@ app_setup_block: | # changelog changelogs: + - { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index a65ec7a..d99d6bb 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-grocy/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-grocy/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; @@ -19,11 +19,16 @@ server { #auth_basic "Restricted"; #auth_basic_user_file /config/nginx/.htpasswd; - try_files $uri $uri/ /index.php$is_args$args; + try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args; } location ~ ^(.+\.php)(.*)$ { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + fastcgi_split_path_info ^(.+\.php)(.*)$; + if (!-f $document_root$fastcgi_script_name) { return 404; } fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; include /etc/nginx/fastcgi_params; From 5e2fae4c2bea37d3b9390ccf6bb4b7ec706e969b Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 6 Mar 2024 12:36:53 -0500 Subject: [PATCH 2/3] update date --- root/defaults/nginx/site-confs/default.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index d99d6bb..d6601d0 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-grocy/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/06/03 - Changelog: https://github.com/linuxserver/docker-grocy/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; From 9be6c6d91683b6673c7314d3ee6d2f189551cd57 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 6 Mar 2024 12:40:23 -0500 Subject: [PATCH 3/3] fix date --- root/defaults/nginx/site-confs/default.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index d6601d0..5b850cd 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2024/06/03 - Changelog: https://github.com/linuxserver/docker-grocy/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/03/06 - Changelog: https://github.com/linuxserver/docker-grocy/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server;