From 9151af01177a83944fbcc81d512a753d8fa31a7f Mon Sep 17 00:00:00 2001 From: Timo Schneider Date: Thu, 13 Jun 2024 09:30:03 +0200 Subject: [PATCH] fixed traefik string error --- Makefile | 2 +- docker-compose.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 54dbd4d..c308f4b 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ env: > $(ROOT_DIR).backend-env @echo "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\n\nPOSTGRES_IP=10.42.0.11\nPOSTGRES_DB=keycloak\nKC_DB_URL_DATABASE=\$$POSTGRES_IP\nKC_DB_USERNAME=\$$POSTGRES_USER\nKC_DB_PASSWORD=\$$POSTGRES_PASSWORD" \ > $(ROOT_DIR).keycloak-env - @echo "KC_HOSTNAME=keycloak.local.anxietyprime.de\nJODEL_HOSTNAME=jodel.local.anxietyprime.de\nAPI_HOSTNAME=api.jodel.local.anxietyprime.de" \ + @echo "KC_HOSTNAME=keycloak.local.anxietyprime.de\nJODEL_HOSTNAME=jodel.local.anxietyprime.de\nAPI_HOSTNAME=api.jodel.local.anxietyprime.de\n\n\nPROXY_KC_HOSTNAME=\`\$$KC_HOSTNAME\`\nPROXY_JODEL_HOSTNAME=\`\$$JODEL_HOSTNAME\`\nPROXY_API_HOSTNAME=\`\$$API_HOSTNAME\`" \ > $(ROOT_DIR).env .PHONY = gitsync diff --git a/docker-compose.yaml b/docker-compose.yaml index adace43..217c8d4 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -25,7 +25,7 @@ services: ipv4_address: 10.42.0.10 labels: - "traefik.enable=true" - - "traefik.http.routers.keycloak.rule=Host($KC_HOSTNAME)" + - "traefik.http.routers.keycloak.rule=Host($PROXY_KC_HOSTNAME)" - "traefik.http.routers.keycloak.entrypoints=websecure" - "traefik.http.routers.keycloak.tls.domains[0].main=$KC_HOSTNAME" # - "traefik.http.routers.keycloak.tls.certresolver=letsencrypt" @@ -70,7 +70,7 @@ services: swa-public: labels: - "traefik.enable=true" - - "traefik.http.routers.web-jodel.rule=Host($JODEL_HOSTNAME)" + - "traefik.http.routers.web-jodel.rule=Host($PROXY_JODEL_HOSTNAME)" - "traefik.http.routers.web-jodel.entrypoints=websecure" - "traefik.http.routers.web-jodel.tls.domains[0].main=$JODEL_HOSTNAME" # - "traefik.http.routers.web-jodel.tls.certresolver=letsencrypt" @@ -102,7 +102,7 @@ services: ipv4_address: 10.42.0.18 labels: - "traefik.enable=true" - - "traefik.http.routers.api-jodel.rule=Host($API_HOSTNAME)" + - "traefik.http.routers.api-jodel.rule=Host($PROXY_API_HOSTNAME)" - "traefik.http.routers.api-jodel.entrypoints=websecure" - "traefik.http.routers.api-jodel.tls.domains[0].main=$API_HOSTNAME" # - "traefik.http.routers.api-jodel.tls.certresolver=letsencrypt"