Bot Updating Package Versions

Move ssl.conf include to default.conf

README.md

@@ -242,6 +242,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **13.04.23:** - Move ssl.conf include to default.conf.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.
 * **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
 * **04.11.22:** - Build commits to upstream branch 2.x for the `development` tag.

package_versions.txt

@@ -21,7 +21,7 @@ ca-certificates-bundle              20220614-r4            apk
 clue/stream-filter                  v1.6.0                 php-composer  
 composer/pcre                       3.1.0                  php-composer  
 coreutils                           9.1-r0                 apk           
-curl                                7.88.1-r1              apk           
+curl                                8.0.1-r0               apk           
 dflydev/dot-access-data             v3.0.2                 php-composer  
 doctrine/cache                      2.2.0                  php-composer  
 doctrine/dbal                       3.5.1                  php-composer  
@@ -104,8 +104,8 @@ pcre                                8.45-r2                apk
 pcre2                               10.42-r0               apk           
 phar-io/manifest                    2.0.3                  php-composer  
 phar-io/version                     3.2.1                  php-composer  
-php-cli                             8.1.17                 binary        
+php-cli                             8.1.18                 binary        
-php-fpm                             8.1.17                 binary        
+php-fpm                             8.1.18                 binary        
 php-http/cache-plugin               1.7.5                  php-composer  
 php-http/client-common              2.6.0                  php-composer  
 php-http/discovery                  1.14.3                 php-composer  
@@ -114,25 +114,25 @@ php-http/message                    1.13.0                 php-composer
 php-http/message-factory            v1.0.2                 php-composer  
 php-http/multipart-stream-builder   1.2.0                  php-composer  
 php-http/promise                    1.1.0                  php-composer  
-php81                               8.1.17-r0              apk           
+php81                               8.1.18-r0              apk           
 php81-common                        8.1.18-r0              apk           
 php81-ctype                         8.1.18-r0              apk           
 php81-curl                          8.1.18-r0              apk           
-php81-fileinfo                      8.1.17-r0              apk           
+php81-fileinfo                      8.1.18-r0              apk           
-php81-fpm                           8.1.17-r0              apk           
+php81-fpm                           8.1.18-r0              apk           
 php81-intl                          8.1.18-r0              apk           
-php81-mbstring                      8.1.17-r0              apk           
+php81-mbstring                      8.1.18-r0              apk           
 php81-mysqlnd                       8.1.18-r0              apk           
 php81-openssl                       8.1.18-r0              apk           
 php81-pdo                           8.1.18-r0              apk           
 php81-pdo_mysql                     8.1.18-r0              apk           
 php81-pdo_pgsql                     8.1.18-r0              apk           
 php81-pdo_sqlite                    8.1.18-r0              apk           
-php81-session                       8.1.17-r0              apk           
+php81-session                       8.1.18-r0              apk           
-php81-simplexml                     8.1.17-r0              apk           
+php81-simplexml                     8.1.18-r0              apk           
 php81-tokenizer                     8.1.18-r0              apk           
-php81-xml                           8.1.17-r0              apk           
+php81-xml                           8.1.18-r0              apk           
-php81-xmlwriter                     8.1.17-r0              apk           
+php81-xmlwriter                     8.1.18-r0              apk           
 php81-zip                           8.1.18-r0              apk           
 phpdocumentor/reflection-common     2.2.0                  php-composer  
 phpdocumentor/type-resolver         1.6.2                  php-composer  

readme-vars.yml

@@ -50,6 +50,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
   - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
   - { date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
   - { date: "04.11.22:", desc: "Build commits to upstream branch 2.x for the `development` tag." }

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

@@ -1,4 +1,4 @@
-## Version 2022/11/14 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
 
 server {
     listen 80 default_server;
@@ -9,6 +9,8 @@ server {
 
     server_name _;
 
+    include /config/nginx/ssl.conf;
+
     root /app/www/public;
     index index.html index.htm index.php;