Add use_http for all HTTP(s) containers, pt3

parent d589648d
......@@ -204,6 +204,10 @@ services:
{% set http = "" %}
{% if hydra.use_http %}
{% set http = ",traefik.frontend.entryPoints=http" %}
{% set https_redirect = "" %}}
{% else %}}
{% set http = "" %}
{% set https_redirect = ",traefik.frontend.headers.SSLRedirect=true" %}}
{% endif %}
hydra:
build:
......@@ -229,7 +233,7 @@ services:
- SERVICE_4445_CHECK_HTTP=/health/ready
- SERVICE_4445_CHECK_INTERVAL=15s
- SERVICE_4445_CHECK_TIMEOUT=1s
- SERVICE_4444_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=4444,traefik.frontend.headers.SSLRedirect=true,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/auth/o,traefik.frontend.headers.customResponseHeaders=Access-Control-Allow-Origin:*
- SERVICE_4444_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=4444{{ https_redirect }},traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/auth/o,traefik.frontend.headers.customResponseHeaders=Access-Control-Allow-Origin:*
- LOG_LEVEL={{ hydra.log_level }}
- OAUTH2_ISSUER_URL={{ minadmin.oidc.issuer_url }}
......@@ -326,9 +330,12 @@ services:
condition: none
{% endif %}
{% set http = "" %}
{% if minadmin.use_http %}
{% set http = ",traefik.frontend.entryPoints=http" %}
{% set https_redirect = "" %}}
{% else %}}
{% set http = "" %}
{% set https_redirect = ",traefik.frontend.headers.SSLRedirect=true" %}}
{% endif %}
minadmin-main:
image: minadmin/minadmin_main:latest
......@@ -342,7 +349,7 @@ services:
- SERVICE_8080_CHECK_HTTP=/health
- SERVICE_8080_CHECK_INTERVAL=15s
- SERVICE_8080_CHECK_TIMEOUT=1s
- SERVICE_8080_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.headers.SSLRedirect=true,traefik.frontend.rule=Host:{{ minadmin.fqdn }}
- SERVICE_8080_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8080{{ https_redirect }},traefik.frontend.rule=Host:{{ minadmin.fqdn }}
depends_on:
- consul
networks:
......@@ -371,9 +378,12 @@ services:
{% endif %}
{% if minadmin_auth.enable %}
{% set http = "" %}
{% if minadmin_auth.use_http %}
{% set http = ",traefik.frontend.entryPoints=http" %}
{% set https_redirect = "" %}}
{% else %}}
{% set http = "" %}
{% set https_redirect = ",traefik.frontend.headers.SSLRedirect=true" %}}
{% endif %}
minadmin-auth:
image: minadmin/minadmin_auth:latest
......@@ -386,7 +396,7 @@ services:
- MINADMIN_TEMPLATE_VIEWS_FOLDER=/web/views
- MINADMIN_TEMPLATE_DISABLE_CACHE={{ minadmin_auth.template.disable_cache }}
- SERVICE_NAME=minadmin-auth
- SERVICE_8080_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8080,traefik.frontend.headers.SSLRedirect=true,traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/auth/
- SERVICE_8080_TAGS=traefik.enable=true{{ http }},traefik.docker.network=minadmin_backend,traefik.port=8080{{ https_redirect }},traefik.frontend.rule=Host:{{ minadmin.fqdn }};PathPrefixStrip:/auth/
depends_on:
- consul
- minadmin-auth-srv
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment