Browse Source

Rename VIRTUAL_SERVICE_NAME to VIRTUAL_HOST_NAME

feature/more-args
nicolas.dorier 6 years ago
parent
commit
13c7617814
  1. 6
      Production/nginx.tmpl
  2. 2
      docker-compose-generator/docker-fragments/btcpayserver-nginx.yml
  3. 2
      docker-compose-generator/docker-fragments/opt-add-librepatron.yml
  4. 2
      docker-compose-generator/docker-fragments/opt-add-woocommerce.yml

6
Production/nginx.tmpl

@ -159,7 +159,7 @@ upstream {{ $upstream_name }} {
{{/* Get the VIRTUAL_PROTO defined by containers w/ the same vhost, falling back to "http" */}}
{{ $proto := trim (or (first (groupByKeys $containers "Env.VIRTUAL_PROTO")) "http") }}
{{ $service_name := trim (or (first (groupByKeys $containers "Env.VIRTUAL_SERVICE_NAME")) "") }}
{{ $host_name := trim (or (first (groupByKeys $containers "Env.VIRTUAL_HOST_NAME")) "") }}
{{/* Get the NETWORK_ACCESS defined by containers w/ the same vhost, falling back to "external" */}}
{{ $network_tag := or (first (groupByKeys $containers "Env.NETWORK_ACCESS")) "external" }}
@ -299,7 +299,7 @@ server {
{{ end }}
}
{{ if eq $service_name "btcpay" }}
{{ if eq $host_name "btcpay" }}
{{ range $container := $ }}
{{ $serviceName := (index $container.Labels "com.docker.compose.service") }}
{{ if (eq $serviceName "lnd_bitcoin") }}
@ -350,7 +350,7 @@ server {
{{ end }}
{{ end }}
{{ if eq $service_name "librepatron" }}
{{ if eq $host_name "librepatron" }}
{{ range $container := $ }}
{{ $serviceName := (index $container.Labels "com.docker.compose.service") }}
{{ if (eq $serviceName "isso") }}

2
docker-compose-generator/docker-fragments/btcpayserver-nginx.yml

@ -8,7 +8,7 @@ services:
VIRTUAL_NETWORK: nginx-proxy
VIRTUAL_PORT: 49392
VIRTUAL_HOST: ${BTCPAY_HOST}
VIRTUAL_SERVICE_NAME: "btcpay"
VIRTUAL_HOST_NAME: "btcpay"
SSL_POLICY: Mozilla-Modern
# Let's encrypt settings

2
docker-compose-generator/docker-fragments/opt-add-librepatron.yml

@ -18,7 +18,7 @@ services:
VIRTUAL_HOST: ${LIBREPATRON_HOST}
LETSENCRYPT_HOST: ${LIBREPATRON_HOST}
LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-<no value>}
VIRTUAL_SERVICE_NAME: "librepatron"
VIRTUAL_HOST_NAME: "librepatron"
isso:
container_name: isso

2
docker-compose-generator/docker-fragments/opt-add-woocommerce.yml

@ -11,7 +11,7 @@ services:
LETSENCRYPT_HOST: ${WOOCOMMERCE_HOST}
LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-<no value>}
VIRTUAL_HOST: ${WOOCOMMERCE_HOST}
VIRTUAL_SERVICE_NAME: "woocommerce"
VIRTUAL_HOST_NAME: "woocommerce"
expose:
- "80"
links:

Loading…
Cancel
Save