From fa2bc834ef18fd97704e3ab64b107c6463b1dc1a Mon Sep 17 00:00:00 2001
From: Jan Beilicke <dev@jotbe.io>
Date: Thu, 2 Apr 2020 19:18:33 +0200
Subject: [PATCH] Updates Traefik to v2.2 and enables global entry point
 redirection http to https

See also PR: https://github.com/containous/traefik/pull/6417
---
 templates/docker-compose.traefik.yml.j2 | 2 +-
 templates/traefik.toml.j2               | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/templates/docker-compose.traefik.yml.j2 b/templates/docker-compose.traefik.yml.j2
index f509293..f704533 100644
--- a/templates/docker-compose.traefik.yml.j2
+++ b/templates/docker-compose.traefik.yml.j2
@@ -8,7 +8,7 @@ networks:
 services:
   # Load Balancer / SSL / Web Server
   revproxy:
-    image: traefik:v2.1
+    image: traefik:v2.2
     restart: always
     networks:
       - public
diff --git a/templates/traefik.toml.j2 b/templates/traefik.toml.j2
index 11cee39..3caebc5 100644
--- a/templates/traefik.toml.j2
+++ b/templates/traefik.toml.j2
@@ -6,6 +6,11 @@ defaultEntryPoints = ["web", "websecure"]
 [entryPoints]
   [entryPoints.web]
     address = ":80"
+    [entryPoints.web.http]
+      [entryPoints.web.http.redirections]
+        [entryPoints.web.http.redirections.entryPoint]
+          to = "websecure"
+          scheme = "https"
   [entryPoints.websecure]
     address = ":443"