From d6b220b588533fd0451770b4f5a66891af207ede Mon Sep 17 00:00:00 2001
From: Sheppy <sheppy@atlantishq.de>
Date: Fri, 23 Jun 2023 17:24:09 +0000
Subject: [PATCH] fix: redirect http->https on acme terminating servers

---
 templates/nginx_server_block.conf.j2 | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/templates/nginx_server_block.conf.j2 b/templates/nginx_server_block.conf.j2
index 57573e0..1633cde 100644
--- a/templates/nginx_server_block.conf.j2
+++ b/templates/nginx_server_block.conf.j2
@@ -9,10 +9,11 @@ server{
 
     {% if acme %}
     include acme-challenge.conf;
-    {% endif %}
-
+    {% else %}
     listen 80;
     listen [::]:80;
+    {% endif %}
+
 
     {% if cert_optional %}
     ssl_client_certificate ca_cert.pem;
@@ -42,3 +43,19 @@ server{
     }
 }
 
+{% if acme %}
+server{
+
+    # {{ comment }}
+    
+    listen 80;
+    listen [::]:80;
+
+    {% if servernames %}server_name{% for s in servernames %} {{ s }}{% endfor %};{% endif %}
+
+
+    include acme-challenge.conf;
+    return 301 https://$host$request_uri;
+
+}
+{% endif %}