Merge branch 'main' into 3.19

linuxserver · Dec 28, 2023 · f62ee0a · f62ee0a
2 parents e730103 + a6367d0
commit f62ee0a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -297,6 +297,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.
 * **06.09.23:** - Add support for custom themes.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **13.04.23:** - Move ssl.conf include to default.conf.

diff --git a/package_versions.txt b/package_versions.txt
@@ -19,6 +19,7 @@ busybox-binsh                     1.36.1-r5               apk
 ca-certificates                   20230506-r0             apk           
 ca-certificates-bundle            20230506-r0             apk           
 code-lts/u2f-php-server           v1.2.1                  php-composer  
+composer                          2.6.6                   binary        
 composer/ca-bundle                1.3.5                   php-composer  
 coreutils                         9.3-r1                  apk           
 curl                              8.5.0-r0                apk           

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -46,7 +46,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: "21.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: "06.09.23:", desc: "Add support for custom themes." }
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }

diff --git 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-phpmyadmin/commits/main/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-phpmyadmin/commits/main/root/defaults/nginx/site-confs/default.conf.sample
 
 map $sent_http_content_type $expires {
     default         off;
@@ -19,7 +19,7 @@ server {
     include /config/nginx/ssl.conf;
 
     root /app/www/public;
-    index index.php index.html;
+    index index.html index.htm index.php;
 
     location / {
         # enable for basic auth
@@ -28,15 +28,21 @@ server {
 
         expires $expires;
 
-        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;
-        fastcgi_read_timeout 3600;
         include /etc/nginx/fastcgi_params;
+
+        fastcgi_read_timeout 3600;
     }
 
     # deny access to .htaccess/.htpasswd files