From d97fc18699deca48695f1f774b12b0e641c8da4e Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 13 Apr 2023 11:04:38 -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 80af1bd..b3797ee 100644 --- a/README.md +++ b/README.md @@ -290,6 +290,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. * **01.03.23:** - Add php iconv. * **19.01.23:** - Rebase to alpine 3.17 with php8.1. * **16.01.23:** - Wrap `.env` values in quotes. diff --git a/readme-vars.yml b/readme-vars.yml index 0b8d875..5064af1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -117,6 +117,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "01.03.23:", desc: "Add php iconv." } - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { date: "16.01.23:", desc: "Wrap `.env` values in quotes." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index e52e78c..3fd7d26 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-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-bookstack/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;