From 3afcaaa1c207be42caa3ce1139d1dcc3ba198bb2 Mon Sep 17 00:00:00 2001
From: pierre <pierre@geeraert.eu>
Date: Wed, 2 Sep 2026 11:56:10 +0100
Subject: [PATCH] add changes

---
 terraform/module.tf          |  1 +
 terraform/nginx_config.tftpl | 35 +++++++++++++++--------------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/terraform/module.tf b/terraform/module.tf
index d9b62d0..fb5eab6 100644
--- a/terraform/module.tf
+++ b/terraform/module.tf
@@ -102,6 +102,7 @@ resource "kubernetes_config_map" "automatic-configmap" {
       listen_port_80_bool     = value.listen_port_80_bool
       geoip_blocking          = value.geoip_blocking
       geoip_allow             = value.geoip_allow
+      redirect_to_root_domain = value.redirect_to_root_domain
     }) if value.enabled == true
   }
 
diff --git a/terraform/nginx_config.tftpl b/terraform/nginx_config.tftpl
index f57da91..64d77c4 100644
--- a/terraform/nginx_config.tftpl
+++ b/terraform/nginx_config.tftpl
@@ -8,7 +8,6 @@ upstream ${name_site}_backend {
     }
 
 
-%{~ if redirect_to_root_domain = False~}
 server {
         server_name ${name_site}.tryton.geeraert.eu www.${name_site}.tryton.geeraert.eu;
 	%{ if geoip_blocking}
@@ -19,6 +18,19 @@ server {
         }
 	%{ endif }
 
+%{~ if redirect_to_root_domain~}
+        if ($host = www.${name_site}.tryton.geeraert.eu) {
+                return 301 https://${name_site}.geeraert.eu$request_uri;
+        }
+
+
+        if ($host = ${name_site}.tryton.geeraert.eu) {
+                return 301 https://${name_site}.geeraert.eu$request_uri;
+        }
+
+        %{~ endif ~}
+	%{ if redirect_to_root_domain != true }
+
         location / {
                 proxy_pass %{ if proxy_pass_https}https%{else}http%{ endif }://${name_site}_backend;
                 proxy_set_header    Upgrade     $http_upgrade;
@@ -56,6 +68,8 @@ server {
 	#	return 444; 
 	#}
 
+	%{ endif }
+
 	access_log /var/log/nginx/access.log my_custom_format;
         access_log /var/log/nginx/ip_audit.log ip_audit;
         access_log /var/log/nginx/backend_debug.log backend_debug;
@@ -95,29 +109,10 @@ server {
 }
 %{~ endif ~}
 
-%{~ endif ~}
 
 
 
 
-%{~ if redirect_to_root_domain~}
-
-server {
-        if ($host = www.${name_site}.tryton.geeraert.eu) {
-                return 301 https://${name_site}.geeraert.eu$request_uri;
-        }
-
-
-        if ($host = ${name_site}.tryton.geeraert.eu) {
-                return 301 https://${name_site}.geeraert.eu$request_uri;
-        }
-        server_name www.${name_site}.tryton.geeraert.eu ${name_site}.tryton.geeraert.eu ;
-        listen 80;
-        return 404;
-
-}
-%{~ endif ~}
-
 ############################################
 #       config file for ${name_site}
 ############################################