From ff78ce6dd3f48ed339328591572824ee43b391b0 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 13 Apr 2023 11:06:00 -0500
Subject: [PATCH] Move ssl.conf include to default.conf

---
 README.md                                          | 1 +
 readme-vars.yml                                    | 1 +
 root/defaults/nginx/site-confs/default.conf.sample | 4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f0dc3c8..a671a33 100644
--- a/README.md
+++ b/README.md
@@ -232,6 +232,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.
 * **18.11.22:** - Rebasing to Alpine 3.16, migrate to s6v3.
 * **20.08.22:** - Rebasing to Alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
diff --git a/readme-vars.yml b/readme-vars.yml
index efc519a..54f704d 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -47,6 +47,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: "18.11.22:", desc: "Rebasing to Alpine 3.16, migrate to s6v3." }
   - { date: "20.08.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))." }
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index 6377ef5..bdddd5e 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,4 +1,4 @@
-## Version 2022/10/04 - Changelog: https://github.com/linuxserver/docker-phpmyadmin/commits/main/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2023/04/13 - 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;
@@ -16,6 +16,8 @@ server {
 
     server_name _;
 
+    include /config/nginx/ssl.conf;
+
     root /app/www/public;
     index index.php index.html;