SWA-Project/deploy
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: SWA-Project:local
Branches Tags
SWA-Project:main SWA-Project:local
...
compare: SWA-Project:5f8ab1fb3210385db800de7a07712a02754a74ae
Branches Tags
SWA-Project:main SWA-Project:local

2 Commits
local ... 5f8ab1fb32

Author SHA1 Message Date
Timo
5f8ab1fb32 fixed traefik tls 2024-06-04 10:30:49 +02:00
timoschneider
bbfa7fc867 made IPs absolute to force isolated networks 2024-06-01 22:05:41 +02:00
2 changed files with 5 additions and 5 deletions
Expand all files Collapse all files

4
Makefile
View File

@@ -23,9 +23,9 @@ help:
.PHONY = env .PHONY = env
env: env:
@echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\n\nPOSTGRES_IP=database\nPOSTGRES_DB=Jodel" \ @echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\n\nPOSTGRES_IP=10.42.0.19\nPOSTGRES_DB=Jodel" \
> .backend-env > .backend-env
@echo -e "POSTGRES_USER=\nPOSTGRES_PASSWORD=\n\nKEYCLOAK_ADMIN=\nKEYCLOAK_ADMIN_PASSWORD=\n\n\nKC_HOSTNAME=keycloak.local.anxietyprime.de\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\n\nKC_HOSTNAME=keycloak.local.anxietyprime.de\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" \
> .keycloak-env > .keycloak-env
.PHONY = gitsync .PHONY = gitsync

6
docker-compose.yaml
View File

@@ -27,7 +27,7 @@ services:
- "traefik.http.routers.keycloak.rule=Host(`keycloak.local.anxietyprime.de`)" - "traefik.http.routers.keycloak.rule=Host(`keycloak.local.anxietyprime.de`)"
- "traefik.http.routers.keycloak.entrypoints=websecure" - "traefik.http.routers.keycloak.entrypoints=websecure"
- "traefik.http.routers.keycloak.tls.domains[0].main=keycloak.local.anxietyprime.de" - "traefik.http.routers.keycloak.tls.domains[0].main=keycloak.local.anxietyprime.de"
# - "traefik.http.routers.keycloak-web.tls.providers=letsencrypt" # - "traefik.http.routers.keycloak-web.tls.certresolver=letsencrypt"
- "traefik.http.services.keycloak.loadbalancer.server.port=8080" - "traefik.http.services.keycloak.loadbalancer.server.port=8080"
- "traefik.http.routers.keycloak.service=keycloak" - "traefik.http.routers.keycloak.service=keycloak"
healthcheck: healthcheck:
@@ -72,7 +72,7 @@ services:
- "traefik.http.routers.web-jodel.rule=Host(`jodel.local.anxietyprime.de`)" - "traefik.http.routers.web-jodel.rule=Host(`jodel.local.anxietyprime.de`)"
- "traefik.http.routers.web-jodel.entrypoints=websecure" - "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.domains[0].main=jodel.local.anxietyprime.de"
# - "traefik.http.routers.web-jodel.tls.providers=letsencrypt" # - "traefik.http.routers.web-jodel.tls.certresolver=letsencrypt"
- "traefik.http.services.web-jodel.loadbalancer.server.port=80" - "traefik.http.services.web-jodel.loadbalancer.server.port=80"
- "traefik.http.routers.web-jodel.service=web-jodel" - "traefik.http.routers.web-jodel.service=web-jodel"
healthcheck: healthcheck:
@@ -103,7 +103,7 @@ services:
- "traefik.http.routers.api-jodel.rule=Host(`api.jodel.local.anxietyprime.de`)" - "traefik.http.routers.api-jodel.rule=Host(`api.jodel.local.anxietyprime.de`)"
- "traefik.http.routers.api-jodel.entrypoints=websecure" - "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.domains[0].main=api.jodel.local.anxietyprime.de"
# - "traefik.http.routers.api-jodel.tls.providers=letsencrypt" # - "traefik.http.routers.api-jodel.tls.certresolver=letsencrypt"
- "traefik.http.services.api-jodel.loadbalancer.server.port=8080" - "traefik.http.services.api-jodel.loadbalancer.server.port=8080"
- "traefik.http.routers.api-jodel.service=api-jodel" - "traefik.http.routers.api-jodel.service=api-jodel"
healthcheck: healthcheck: