From 2d367d26fa23bdc0beaa68b72c98c659233bc30b Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Sat, 13 Mar 2021 14:12:25 +0100
Subject: [PATCH 1/2] web deployment clean up

---
 www/docker-compose.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/www/docker-compose.yml b/www/docker-compose.yml
index bb55fc7..95c9811 100644
--- a/www/docker-compose.yml
+++ b/www/docker-compose.yml
@@ -11,13 +11,8 @@ services:
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.web.entrypoints=http"
-      - "traefik.http.routers.web.rule=Host(`${DOMAIN}`) || Host(`www.${DOMAIN}`)"
-      - "traefik.http.middlewares.web-https-redirect.redirectscheme.scheme=https"
-      - "traefik.http.routers.web.middlewares=web-https-redirect"
       - "traefik.http.routers.web-secure.entrypoints=websecure"
       - "traefik.http.routers.web-secure.rule=Host(`${DOMAIN}`) || Host(`www.${DOMAIN}`)"
-      - "traefik.http.routers.web-secure.tls=true"
       - "traefik.http.routers.web-secure.tls.certresolver=myresolver"
       - "traefik.http.routers.web-secure.tls.options=intermediate@file"
       - "traefik.docker.network=web"

From be737857bf2c2fe92d9088043b0d52eef9d24eee Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Sat, 13 Mar 2021 14:12:56 +0100
Subject: [PATCH 2/2] Upgrade to Traefik 2.4

---
 proxy/docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml
index 5942b9f..55e8f11 100644
--- a/proxy/docker-compose.yaml
+++ b/proxy/docker-compose.yaml
@@ -3,7 +3,7 @@ version: "3.3"
 services:
 
   traefik:
-    image: traefik:v2.3
+    image: traefik:v2.4
     restart: unless-stopped
     command:
       - "--api.insecure=false"