diff --git a/README.md b/README.md index af237fd..67de0ae 100644 --- a/README.md +++ b/README.md @@ -225,6 +225,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. * **29.11.22:** - Rebase to Alpine 3.17, migrate to s6v3. * **04.15.22:** - Added NPM command to run db migrations. * **02.05.22:** - Initial Release. diff --git a/readme-vars.yml b/readme-vars.yml index ceb59d9..3a415b1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -33,6 +33,7 @@ app_setup_block: | Access the web gui at http://SERVERIP:PORT # changelog changelogs: + - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "29.11.22:", desc: "Rebase to Alpine 3.17, migrate to s6v3." } - { date: "04.15.22:", desc: "Added NPM command to run db migrations." } - { date: "02.05.22:", desc: "Initial Release." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index c769987..8ec3cfd 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/11/29 - Changelog: https://github.com/linuxserver/docker-budge/commits/main/root/defaults/nginx/site-confs/default.conf.sample +## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-budge/commits/main/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/frontend/build; index index.php index.html index.htm;