diff --git a/Makefile b/Makefile index 02b50e8..6140767 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ help: env: @echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\n\nPOSTGRES_IP=database\nPOSTGRES_DB=Jodel" \ > .backend-env - @echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\n\nPOSTGRES_IP=keycloak-db\nPOSTGRES_DB=keycloak\nKC_DB_URL_DATABASE=\$$POSTGRES_IP\nKC_DB_USERNAME=\$$POSTGRES_USER\nKC_DB_PASSWORD=\$$POSTGRES_PASSWORD" \ + @echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\nKC_HOSTNAME=\n\n\nPOSTGRES_IP=keycloak-db\nPOSTGRES_DB=keycloak\nKC_DB_URL_DATABASE=\$$POSTGRES_IP\nKC_DB_USERNAME=\$$POSTGRES_USER\nKC_DB_PASSWORD=\$$POSTGRES_PASSWORD" \ > .keycloak-env .PHONY = gitsync diff --git a/docker-compose.yaml b/docker-compose.yaml index 2f9f753..559ba0c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,7 +11,9 @@ services: KC_DB_URL: jdbc:postgresql://keycloak-db/keycloak #KC_HTTP_RELATIVE_PATH: /auth PROXY_ADDRESS_FORWARDING: true - KEYCLOAK_HOSTNAME: keycloak.local.anxietyprime.de + KC_PROXY: edge + KC_HOSTNAME_STRICT: false + KC_HTTP_ENABLED: true expose: - 8080 networks: @@ -25,6 +27,7 @@ services: - "traefik.http.routers.keycloak.rule=Host(`keycloak.local.anxietyprime.de`)" - "traefik.http.routers.keycloak.entrypoints=websecure" - "traefik.http.routers.keycloak.tls.domains[0].main=keycloak.local.anxietyprime.de" + # - "traefik.http.routers.keycloak-web.tls.providers=letsencrypt" - "traefik.http.services.keycloak.loadbalancer.server.port=8080" - "traefik.http.routers.keycloak.service=keycloak" healthcheck: @@ -69,6 +72,7 @@ services: - "traefik.http.routers.web-jodel.rule=Host(`jodel.local.anxietyprime.de`)" - "traefik.http.routers.web-jodel.entrypoints=websecure" - "traefik.http.routers.web-jodel.tls.domains[0].main=jodel.local.anxietyprime.de" + # - "traefik.http.routers.web-jodel.tls.providers=letsencrypt" - "traefik.http.services.web-jodel.loadbalancer.server.port=80" - "traefik.http.routers.web-jodel.service=web-jodel" healthcheck: @@ -99,6 +103,7 @@ services: - "traefik.http.routers.api-jodel.rule=Host(`api.jodel.local.anxietyprime.de`)" - "traefik.http.routers.api-jodel.entrypoints=websecure" - "traefik.http.routers.api-jodel.tls.domains[0].main=api.jodel.local.anxietyprime.de" + # - "traefik.http.routers.api-jodel.tls.providers=letsencrypt" - "traefik.http.services.api-jodel.loadbalancer.server.port=8080" - "traefik.http.routers.api-jodel.service=api-jodel" healthcheck: