LAB-linuxserver/docker-phpmyadmin
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-phpmyadmin.git synced 2026-01-21 04:32:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Move ssl.conf include to default.conf
This commit is contained in:
Eric Nemchik 2023-04-15 10:24:41 -05:00 committed by GitHub
commit ba6eb79fc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -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)).

1
readme-vars.yml
View File

@ -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))." }

4
root/defaults/nginx/site-confs/default.conf.sample
View File

@ -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;