Bot Updating Package Versions

Merge pull request #154 from linuxserver/delete-default-conf-development
Delete root/defaults/nginx/site-confs/default.conf.sample [development]
2026-04-05 11:06:33 +09:00 · 2024-07-26 18:32:25 +00:00 · 2024-07-19 16:35:09 -05:00 · 2024-07-19 18:34:10 +00:00 · 2024-07-16 20:48:40 -05:00
2 changed files with 3 additions and 41 deletions
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -4,7 +4,7 @@ alpine-baselayout                   3.6.5-r0               apk
 alpine-baselayout-data              3.6.5-r0               apk             
 alpine-keys                         2.4-r1                 apk             
 alpine-release                      3.20.1-r0              apk             
-apache2-utils                       2.4.61-r0              apk             
+apache2-utils                       2.4.62-r0              apk             
 apk-tools                           2.14.4-r0              apk             
 apr                                 1.7.4-r0               apk             
 apr-util                            1.6.3-r1               apk             
@@ -19,8 +19,8 @@ brotli-libs                         1.1.0-r2               apk
 busybox                             1.36.1-r29             apk             
 busybox-binsh                       1.36.1-r29             apk             
 c-ares                              1.28.1-r0              apk             
-ca-certificates                     20240226-r0            apk             
-ca-certificates-bundle              20240226-r0            apk             
+ca-certificates                     20240705-r0            apk             
+ca-certificates-bundle              20240705-r0            apk             
 carbonphp/carbon-doctrine-types     2.1.0                  php-composer    
 catatonit                           0.2.0-r0               apk             
 clue/stream-filter                  v1.7.0                 php-composer    
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,38 +0,0 @@
-## Version 2024/06/27 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
-
-server {
-    listen *:80 default_server;
-    listen *:443 ssl default_server;
-
-    server_name _;
-
-    include /config/nginx/ssl.conf;
-
-    root /app/www/public;
-    index index.html index.htm index.php;
-
-    location / {
-        # enable for basic auth
-        #auth_basic "Restricted";
-        #auth_basic_user_file /config/nginx/.htpasswd;
-
-        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;
-    }
-
-    # deny access to .htaccess/.htpasswd files
-    location ~ /\.ht {
-        deny all;
-    }
-}
Author	SHA1	Message	Date
LinuxServer-CI	421a86103b	Bot Updating Package Versions	2024-07-26 18:32:25 +00:00
Eric Nemchik	740c467147	Merge pull request #154 from linuxserver/delete-default-conf-development Delete root/defaults/nginx/site-confs/default.conf.sample [development]	2024-07-19 16:35:09 -05:00
LinuxServer-CI	767cc6637f	Bot Updating Package Versions	2024-07-19 18:34:10 +00:00
Eric Nemchik	2835692143	Delete root/defaults/nginx/site-confs/default.conf.sample [development] redundant to base	2024-07-16 20:48:40 -05:00