From 8d0a2d3199cab00cf2bc44a0a2a6a644ad4c6487 Mon Sep 17 00:00:00 2001
From: Emil Marklund <emil@btlcomputing.com>
Date: Thu, 19 May 2022 16:26:11 +0200
Subject: [PATCH 1/3] Fix https redirects

Signed-off-by: Emil Marklund <emil@btlcomputing.com>
---
 Containers/mastercontainer/Caddyfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Containers/mastercontainer/Caddyfile b/Containers/mastercontainer/Caddyfile
index 64a90526..646d37e8 100644
--- a/Containers/mastercontainer/Caddyfile
+++ b/Containers/mastercontainer/Caddyfile
@@ -1,4 +1,6 @@
 {
+    # auto_https will create redirects for https://{host}:8443 instead of https://{host}
+    # https redirects are added manually in the http://:80 block
     auto_https disable_redirects
 
     storage file_system {
@@ -6,6 +8,10 @@
     }
 }
 
+http://:80 {
+  redir https://{host}{uri}
+}
+
 https://:8443 {
 
     reverse_proxy localhost:8000

From d284812c6bb3a413db5311ec1a83f9a646786f28 Mon Sep 17 00:00:00 2001
From: Emil Marklund <emil@btlcomputing.com>
Date: Thu, 19 May 2022 16:41:31 +0200
Subject: [PATCH 2/3] Signing off

Signed-off-by: Emil Marklund <emil@btlcomputing.com>

From a3d676b408cf0ef69de1dfcc15b0c7483ea595ad Mon Sep 17 00:00:00 2001
From: Simon L <szaimen@e.mail.de>
Date: Mon, 23 May 2022 15:16:13 +0200
Subject: [PATCH 3/3] add redirect to https for port 8443

Signed-off-by: szaimen <szaimen@e.mail.de>
---
 Containers/mastercontainer/Caddyfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Containers/mastercontainer/Caddyfile b/Containers/mastercontainer/Caddyfile
index 646d37e8..c4fa9944 100644
--- a/Containers/mastercontainer/Caddyfile
+++ b/Containers/mastercontainer/Caddyfile
@@ -12,6 +12,10 @@ http://:80 {
   redir https://{host}{uri}
 }
 
+http://:8443 {
+  redir https://{host}:8443{uri}
+}
+
 https://:8443 {
 
     reverse_proxy localhost:8000