Merge pull request #54 from linuxserver/move-ssl-include

Move ssl.conf include to default.conf
This commit is contained in:
Eric Nemchik 2023-04-17 12:28:51 -05:00 committed by GitHub
commit e0d56e4158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions

View File

@ -272,6 +272,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.
* **02.03.23:** - Set permissions on crontabs during init.
* **20.08.22:** - Rebasing to alpine 3.17 with php8.1. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
* **25.02.22:** - Add php7-sqlite3 to support rc4 release.

View File

@ -94,6 +94,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
- { date: "02.03.23:", desc: "Set permissions on crontabs during init." }
- { date: "20.08.22:", desc: "Rebasing to alpine 3.17 with php8.1. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
- { date: "25.02.22:", desc: "Add php7-sqlite3 to support rc4 release." }

View File

@ -1,4 +1,4 @@
## Version 2023/01/23 - Changelog: https://github.com/linuxserver/docker-diskover/commits/master/root/defaults/nginx/site-confs/default.conf.sample
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-diskover/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/diskover-web/public;
index index.html index.htm index.php;