Skip to content

Commit 34d11c5

Browse files
authored
Merge pull request #274 from linuxserver/default_server
Add default_server back to default site conf's https listen
2 parents fe294dd + 74723be commit 34d11c5

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILD_DATE
55
ARG VERSION
66
ARG CERTBOT_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8-
LABEL maintainer="aptalca"
8+
LABEL maintainer="nemchik"
99

1010
# environment settings
1111
ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILD_DATE
55
ARG VERSION
66
ARG CERTBOT_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8-
LABEL maintainer="aptalca"
8+
LABEL maintainer="nemchik"
99

1010
# environment settings
1111
ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini

Dockerfile.armhf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILD_DATE
55
ARG VERSION
66
ARG CERTBOT_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8-
LABEL maintainer="aptalca"
8+
LABEL maintainer="nemchik"
99

1010
# environment settings
1111
ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
335335

336336
## Versions
337337

338+
* **03.10.22:** - Add default_server back to default site conf's https listen.
338339
* **22.09.22:** - Added support for DO DNS validation.
339340
* **22.09.22:** - Added certbot-dns-acmedns for DNS01 validation.
340341
* **20.08.22:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ app_setup_nginx_reverse_proxy_block: ""
155155

156156
# changelog
157157
changelogs:
158+
- { date: "03.10.22:", desc: "Add default_server back to default site conf's https listen." }
158159
- { date: "22.09.22:", desc: "Added support for DO DNS validation." }
159160
- { date: "22.09.22:", desc: "Added certbot-dns-acmedns for DNS01 validation." }
160161
- { date: "20.08.22:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) nginx.conf - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }

root/defaults/nginx/site-confs/default.conf.sample

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2022/09/01 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
1+
## Version 2022/10/03 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
22

33
# redirect all traffic to https
44
server {
@@ -12,8 +12,8 @@ server {
1212

1313
# main server block
1414
server {
15-
listen 443 ssl http2;
16-
listen [::]:443 ssl http2;
15+
listen 443 ssl http2 default_server;
16+
listen [::]:443 ssl http2 default_server;
1717

1818
server_name _;
1919

0 commit comments

Comments
 (0)