From 0bfc7e0890069b3599e361f1f91425cbd1d9c553 Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Sun, 28 Jun 2020 16:05:34 +0200
Subject: [PATCH] redirect to websecure

---
 glances/docker-compose.yml |  2 ++
 traefik/docker-compose.yml | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/glances/docker-compose.yml b/glances/docker-compose.yml
index 73c08b7..d116420 100644
--- a/glances/docker-compose.yml
+++ b/glances/docker-compose.yml
@@ -18,9 +18,11 @@ services:
     labels:
       - traefik.enable=true
       - traefik.http.routers.glances.rule=Host(`${HOST_GLANCES}.${DOMAIN}`)
+      - traefik.http.routers.glances.entrypoints=web
       - traefik.http.routers.glances.entrypoints=websecure
       - traefik.http.routers.glances.tls=true
       - traefik.http.routers.glances.tls.certresolver=letsencrypt
+      - traefik.http.routers.glances.middlewares=redirect-to-https
       - traefik.http.services.glances.loadbalancer.server.port=61208
 
 volumes:
diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 4c4fecb..da4eaaf 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -16,17 +16,18 @@ services:
     labels: 
       - traefik.enable=true
       - traefik.http.routers.dashboard.rule=Host(`${HOST_TRAEFIK}.${DOMAIN}`)
+      - traefik.http.routers.dashboard.entrypoints=web
       - traefik.http.routers.dashboard.entrypoints=websecure
       - traefik.http.routers.dashboard.tls=true
-      - traefik.http.routers.dashboard.tls.certresolver=letsencrypt      
+      - traefik.http.routers.dashboard.tls.certresolver=letsencrypt    
       - traefik.http.services.dashboard.loadbalancer.server.port=8080
       # global redirect to https
-      - traefik.http.routers.http-catchall.rule=hostregexp(`{host:.+}`)
-      - traefik.http.routers.http-catchall.entrypoints=web
-      - traefik.http.routers.http-catchall.middlewares=redirect-to-https
+      #- traefik.http.routers.http-catchall.rule=hostregexp(`{host:.+}`)
+      #- traefik.http.routers.http-catchall.entrypoints=web
+      #- traefik.http.routers.http-catchall.middlewares=redirect-to-https
       # middleware redirect
       - traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https
-      - traefik.http.middlewares.redirect-to-https.redirectscheme.permanent=false     
+      - traefik.http.middlewares.redirect-to-https.redirectscheme.permanent=true     
     ports:
       - 80:80
       - 443:443