diff --git a/README.md b/README.md index bf5fb22..1727e6c 100644 --- a/README.md +++ b/README.md @@ -301,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **25.12.23:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. * **13.04.23:** - Move ssl.conf include to default.conf. * **19.01.23:** - Rebase to alpine 3.17 with php8.1. diff --git a/package_versions.txt b/package_versions.txt index 280a024..837d894 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,6 +17,7 @@ busybox 1.36.1-r5 apk busybox-binsh 1.36.1-r5 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk +composer 2.6.6 binary coreutils 9.3-r1 apk curl 8.5.0-r0 apk erusev/parsedown 1.7.4 php-composer diff --git a/readme-vars.yml b/readme-vars.yml index 78de332..20f38a3 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,7 +45,8 @@ app_setup_block: | # changelog changelogs: - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} + - { date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} + - { 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 8a503a9..1817b3f 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-xbackbone/commits/main/root/defaults/nginx/site-confs/default.conf.sample +## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-xbackbone/commits/main/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; @@ -23,11 +23,16 @@ server { #auth_basic "Restricted"; #auth_basic_user_file /config/nginx/.htpasswd; - try_files $uri $uri/ /index.html /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;