From b67d0b8bd706bd5cc2fa1df296783a0777644bea Mon Sep 17 00:00:00 2001 From: Humenius Date: Mon, 1 Jun 2020 16:35:45 +0200 Subject: [PATCH] Fix Traefik redirect, entrypoints and certresolvers --- docker-compose.dev.yml | 18 ++++++++---------- docker-compose.yml | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 9a71644..5d19bb8 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -11,16 +11,15 @@ services: - traefik.enable=true # HTTP + Redirect - - traefik.http.routers.tsotr-frontend.entrypoints=http + - traefik.http.routers.tsotr-frontend.entrypoints=web - traefik.http.routers.tsotr-frontend.rule=Host(`tsotr.humenius.me`) - - traefik.http.routers.tsotr-frontend.middlewares=tsotr-frontend-https-redirect - - traefik.http.middlewares.tsotr-frontend-https-redirect.redirectscheme.scheme=https + - traefik.http.routers.tsotr-frontend.middlewares=redirect@file # HTTPS + Port + network - - traefik.http.routers.tsotr-frontend-secure.entrypoints=https + - traefik.http.routers.tsotr-frontend-secure.entrypoints=web-secure - traefik.http.routers.tsotr-frontend-secure.rule=(`tsotr.humenius.me`) - traefik.http.routers.tsotr-frontend-secure.tls=true - - traefik.http.routers.tsotr-frontend-secure.tls.certresolver=http + - traefik.http.routers.tsotr-frontend-secure.tls.certresolver=letsencrypt - traefik.http.services.tsotr-frontend.loadbalancer.server.port=80 - traefik.docker.network=proxy @@ -35,16 +34,15 @@ services: - traefik.enable=true # HTTP + Redirect - - traefik.http.routers.tsotr-backend.entrypoints=http + - traefik.http.routers.tsotr-backend.entrypoints=web - traefik.http.routers.tsotr-backend.rule=(Host(`tsotr.humenius.me`) && Path(`/api`)) - - traefik.http.routers.tsotr-backend.middlewares=tsotr-backend-https-redirect - - traefik.http.middlewares.tsotr-backend-https-redirect.redirectscheme.scheme=https + - traefik.http.routers.tsotr-backend.middlewares=redirect@file # HTTPS + Port + network - - traefik.http.routers.tsotr-backend-secure.entrypoints=https + - traefik.http.routers.tsotr-backend-secure.entrypoints=web-secure - traefik.http.routers.tsotr-backend-secure.rule=(Host(`tsotr.humenius.me`) && Path(`/api`)) - traefik.http.routers.tsotr-backend-secure.tls=true - - traefik.http.routers.tsotr-backend-secure.tls.certresolver=http + - traefik.http.routers.tsotr-backend-secure.tls.certresolver=letsencrypt - traefik.http.services.tsotr-backend.loadbalancer.server.port=3000 - traefik.docker.network=proxy diff --git a/docker-compose.yml b/docker-compose.yml index d8ea3af..322d067 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,16 +9,15 @@ services: - traefik.enable=true # HTTP + Redirect - - traefik.http.routers.tsotr-frontend.entrypoints=http + - traefik.http.routers.tsotr-frontend.entrypoints=web - traefik.http.routers.tsotr-frontend.rule=Host(`tsotr.humenius.me`) - - traefik.http.routers.tsotr-frontend.middlewares=tsotr-frontend-https-redirect - - traefik.http.middlewares.tsotr-frontend-https-redirect.redirectscheme.scheme=https + - traefik.http.routers.tsotr-frontend.middlewares=redirect@file # HTTPS + Port + network - - traefik.http.routers.tsotr-frontend-secure.entrypoints=https + - traefik.http.routers.tsotr-frontend-secure.entrypoints=web-secure - traefik.http.routers.tsotr-frontend-secure.rule=(`tsotr.humenius.me`) - traefik.http.routers.tsotr-frontend-secure.tls=true - - traefik.http.routers.tsotr-frontend-secure.tls.certresolver=http + - traefik.http.routers.tsotr-frontend-secure.tls.certresolver=letsencrypt - traefik.http.services.tsotr-frontend.loadbalancer.server.port=80 - traefik.docker.network=proxy @@ -30,16 +29,15 @@ services: - traefik.enable=true # HTTP + Redirect - - traefik.http.routers.tsotr-backend.entrypoints=http + - traefik.http.routers.tsotr-backend.entrypoints=web - traefik.http.routers.tsotr-backend.rule=(Host(`tsotr.humenius.me`) && Path(`/api`)) - - traefik.http.routers.tsotr-backend.middlewares=tsotr-backend-https-redirect - - traefik.http.middlewares.tsotr-backend-https-redirect.redirectscheme.scheme=https + - traefik.http.routers.tsotr-backend.middlewares=redirect@file # HTTPS + Port + network - - traefik.http.routers.tsotr-backend-secure.entrypoints=https + - traefik.http.routers.tsotr-backend-secure.entrypoints=web-secure - traefik.http.routers.tsotr-backend-secure.rule=(Host(`tsotr.humenius.me`) && Path(`/api`)) - traefik.http.routers.tsotr-backend-secure.tls=true - - traefik.http.routers.tsotr-backend-secure.tls.certresolver=http + - traefik.http.routers.tsotr-backend-secure.tls.certresolver=letsencrypt - traefik.http.services.tsotr-backend.loadbalancer.server.port=3000 - traefik.docker.network=proxy