2 files changed, 4 insertions, 14 deletions
diff --git a/template/nginx/root.conf.template b/template/nginx/root.conf.template
index 17b558f..9cf1904 100644
--- a/template/nginx/root.conf.template
+++ b/template/nginx/root.conf.template
@@ -81,17 +81,3 @@ server {
 
     client_max_body_size 5G;
 }
-
-server {
-    listen 80;
-    listen [::]:80;
-    server_name ${CRUPEST_NGINX_SUBDOMAIN}.${CRUPEST_DOMAIN};
-
-    location / {
-        return 301 https://$host$request_uri;
-    }
-
-    location /.well-known/acme-challenge {
-        root /srv/acme;
-    }
-}
diff --git a/template/nginx/server.json b/template/nginx/server.json
index 342adae..fa84030 100644
--- a/template/nginx/server.json
+++ b/template/nginx/server.json
@@ -17,6 +17,10 @@
             "upstream": "forgejo:3000"
         },
         {
+            "type": "cert-only",
+            "subdomain": "mail"
+        },
+        {
             "type": "reverse-proxy",
             "subdomain": "2fa",
             "upstream": "2fauth:8000"