From 1e0f456fdb37e4b720f9ebadd31bc3858395b3e3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 8 Jan 2022 05:16:33 +0100
Subject: [PATCH] more template tests

---
 .../sites-available/gradido.conf.template     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
index cceee1ef5..4e2a37796 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
@@ -1,20 +1,21 @@
 server {
-    if ($NGINX_SSL = 'true') {
-        if ($host = $NGINX_SERVER_NAME) {
-            return 301 https://$host$request_uri;
-        }
-
-        server_name $NGINX_SERVER_NAME;
-        listen 80;
-        listen [::]:80;
-        return 404;
+    if ($host = $NGINX_SERVER_NAME) {
+        return 301 https://$host$request_uri;
     }
+
+    server_name $NGINX_SERVER_NAME;
+    listen 80;
+    listen [::]:80;
+    return 404;
 }
 
 server {
     server_name $NGINX_SERVER_NAME;
 
-    if ($NGINX_SSL = 'true') {
+    # Set variables to allow if checks
+    set $SSL "$NGINX_SSL";
+
+    if ($SSL = 'true') {
         listen [::]:443 ssl ipv6only=on;
         listen 443 ssl;
         ssl_certificate $NGINX_SSL_CERTIFICATE;
@@ -25,7 +26,7 @@ server {
         }
     }
 
-    if ($NGINX_SSL != 'true'){
+    if ($SSL != 'true'){
         listen 80;
         listen [::]:80;
     }