aljaz/btcpayserver-docker
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver-docker.git synced 2025-12-17 10:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Can remove https by removing nginx-https fragment

Browse Source
This commit is contained in:
nicolas.dorier
2019-11-07 10:58:38 +09:00
parent 26a74f120b
commit 0f26b807d1
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Production/nginx.tmpl
View File

@@ -272,15 +272,18 @@ server {
{{/* Get the first cert name defined by containers w/ the same vhost */}} {{/* Get the first cert name defined by containers w/ the same vhost */}}
{{ $certName := (first (groupByKeys $containers "Env.CERT_NAME")) }} {{ $certName := (first (groupByKeys $containers "Env.CERT_NAME")) }}
{{/* Get the best matching cert by name for the vhost. */}} {{ $cert := "" }}
{{ $vhostCert := (closest (dir "/etc/nginx/certs") (printf "%s.crt" $host))}} {{ if exists "/etc/nginx/certs" }}
{{/* Get the best matching cert by name for the vhost. */}}
{{ $vhostCert := (closest (dir "/etc/nginx/certs") (printf "%s.crt" $host))}}
{{/* vhostCert is actually a filename so remove any suffixes since they are added later */}} {{/* vhostCert is actually a filename so remove any suffixes since they are added later */}}
{{ $vhostCert := trimSuffix ".crt" $vhostCert }} {{ $vhostCert := trimSuffix ".crt" $vhostCert }}
{{ $vhostCert := trimSuffix ".key" $vhostCert }} {{ $vhostCert := trimSuffix ".key" $vhostCert }}
{{/* Use the cert specified on the container or fallback to the best vhost match */}} {{/* Use the cert specified on the container or fallback to the best vhost match */}}
{{ $cert := (coalesce $certName $vhostCert) }} {{ $cert = (coalesce $certName $vhostCert) }}
{{ end }}
{{ $is_https := (and (ne $https_method "nohttps") (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert))) }} {{ $is_https := (and (ne $https_method "nohttps") (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert))) }}

10
docker-compose-generator/docker-fragments/nginx-https.yml
View File

@@ -17,3 +17,13 @@ services:
ACME_CA_URI: ${ACME_CA_URI:-staging} ACME_CA_URI: ${ACME_CA_URI:-staging}
links: links:
- nginx-gen - nginx-gen
nginx:
ports:
- "${REVERSEPROXY_HTTPS_PORT:-443}:443"
volumes:
- "nginx_certs:/etc/nginx/certs:ro"
nginx-gen:
volumes:
- "nginx_certs:/etc/nginx/certs:ro"

3
docker-compose-generator/docker-fragments/nginx.yml
View File

@@ -7,12 +7,10 @@ services:
container_name: nginx container_name: nginx
ports: ports:
- "${REVERSEPROXY_HTTP_PORT:-80}:80" - "${REVERSEPROXY_HTTP_PORT:-80}:80"
- "${REVERSEPROXY_HTTPS_PORT:-443}:443"
volumes: volumes:
- "nginx_conf:/etc/nginx/conf.d" - "nginx_conf:/etc/nginx/conf.d"
- "nginx_vhost:/etc/nginx/vhost.d" - "nginx_vhost:/etc/nginx/vhost.d"
- "nginx_html:/usr/share/nginx/html" - "nginx_html:/usr/share/nginx/html"
- "nginx_certs:/etc/nginx/certs:ro"
nginx-gen: nginx-gen:
restart: unless-stopped restart: unless-stopped
image: btcpayserver/docker-gen:0.7.6 image: btcpayserver/docker-gen:0.7.6
@@ -25,7 +23,6 @@ services:
- "nginx_conf:/etc/nginx/conf.d" - "nginx_conf:/etc/nginx/conf.d"
- "nginx_vhost:/etc/nginx/vhost.d" - "nginx_vhost:/etc/nginx/vhost.d"
- "nginx_html:/usr/share/nginx/html" - "nginx_html:/usr/share/nginx/html"
- "nginx_certs:/etc/nginx/certs:ro"
entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
links: links:
- btcpayserver - btcpayserver