From a9824b701be10319932917e572a0547d6d32212d Mon Sep 17 00:00:00 2001 From: Marvin Sextro Date: Sun, 27 Jun 2021 00:39:19 +0200 Subject: [PATCH] Fix https redirect --- docker-compose.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8671667..e3df3fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,19 +16,22 @@ services: #- "--certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" - "--certificatesresolvers.myresolver.acme.email=marvin.sextro@gmail.com" - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json" + - "--entrypoints.web.http.redirections.entryPoint.to=websecure" + - "--entrypoints.web.http.redirections.entryPoint.scheme=https" + - "--entrypoints.web.http.redirections.entrypoint.permanent=true" ports: + - "80:80" - "443:443" - "8080:8080" volumes: - "./letsencrypt:/letsencrypt" - - "/var/run/docker.sock:/var/run/docker.sock:ro" + - "/var/run/docker.sock:/var/run/docker.sock:ro" covidpass-api: image: "marvinsxtr/covidpass-api:latest" restart: "unless-stopped" environment: - NODE_ENV=production - - API_URL=https://api.covidpass.marvinsextro.de/covid.pkpass ports: - "8000:8000" labels: @@ -36,10 +39,6 @@ services: - "traefik.http.routers.covidpass-api.rule=Host(`api.covidpass.marvinsextro.de`)" - "traefik.http.routers.covidpass-api.entrypoints=websecure" - "traefik.http.routers.covidpass-api.tls.certresolver=myresolver" - - "traefik.http.routers.covidpass-api.middlewares=covidpass-api-https-only" - - "traefik.http.middlewares.covidpass-api-https-only.redirectscheme.scheme=https" - - "traefik.http.middlewares.covidpass-api-https-only.redirectscheme.permanent=true" - - "traefik.http.middlewares.covidpass-api-https-only.redirectscheme.port=443" secrets: - env @@ -55,10 +54,6 @@ services: - "traefik.http.routers.covidpass.rule=Host(`covidpass.marvinsextro.de`)" - "traefik.http.routers.covidpass.entrypoints=websecure" - "traefik.http.routers.covidpass.tls.certresolver=myresolver" - - "traefik.http.routers.covidpass.middlewares=covidpass-https-only" - - "traefik.http.middlewares.covidpass-https-only.redirectscheme.scheme=https" - - "traefik.http.middlewares.covidpass-https-only.redirectscheme.permanent=true" - - "traefik.http.middlewares.covidpass-https-only.redirectscheme.port=443" depends_on: - covidpass-api