From 44ad14811d64a8e75d7e857fb3cbf927962adb3d Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Wed, 1 Feb 2023 11:12:05 +0000 Subject: [PATCH] Missed some IF statements that must be modified for normalized config. --- core/nginx/conf/nginx.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf index ec2e2029..89eeb4bf 100644 --- a/core/nginx/conf/nginx.conf +++ b/core/nginx/conf/nginx.conf @@ -53,7 +53,7 @@ http { gzip_min_length 1024; # TODO: figure out how to server pre-compressed assets from admin container - {% if KUBERNETES_INGRESS != 'true' and TLS_FLAVOR in [ 'letsencrypt', 'cert' ] %} + {% if not KUBERNETES_INGRESS and TLS_FLAVOR in [ 'letsencrypt', 'cert' ] %} # Enable the proxy for certbot if the flavor is letsencrypt and not on kubernetes # server { @@ -99,7 +99,7 @@ http { {% endif %} # Only enable HTTPS if TLS is enabled with no error and not on kubernetes - {% if KUBERNETES_INGRESS != 'true' and TLS and not TLS_ERROR %} + {% if not KUBERNETES_INGRESS and TLS and not TLS_ERROR %} listen 443 ssl http2; {% if SUBNET6 %} listen [::]:443 ssl http2; @@ -158,7 +158,7 @@ http { {% endif %} # If TLS is failing, prevent access to anything except certbot - {% if KUBERNETES_INGRESS != 'true' and TLS_ERROR and not (TLS_FLAVOR in [ 'mail-letsencrypt', 'mail' ]) %} + {% if not KUBERNETES_INGRESS and TLS_ERROR and not (TLS_FLAVOR in [ 'mail-letsencrypt', 'mail' ]) %} location / { return 403; }