From 706673a4a3eae0387735027ecc95105d10322f08 Mon Sep 17 00:00:00 2001
From: pierre <pierre@geeraert.eu>
Date: Wed, 23 Apr 2025 10:21:39 +0100
Subject: [PATCH] enable disabling https redirection and allowing port 80

---
 terraform/module.tf             |  7 +++++++
 terraform/variables.auto.tfvars | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/terraform/module.tf b/terraform/module.tf
index f2a10fe..23ec1c4 100644
--- a/terraform/module.tf
+++ b/terraform/module.tf
@@ -12,6 +12,9 @@ variable "nginx_sites" {
     http2_bool              = optional(bool, false)
     proxy_pass_https        = optional(bool, false)
     authentication_required = optional(bool, false)
+    redirect_to_https_bool  = optional(bool, true)
+    listen_port_80_bool     = optional(bool, false)
+
   }))
 
 }
@@ -28,6 +31,8 @@ resource "local_file" "nginx" {
     http2_bool              = each.value.http2_bool
     proxy_pass_https        = each.value.proxy_pass_https
     authentication_required = each.value.authentication_required
+    redirect_to_https_bool = each.value.redirect_to_https_bool
+    listen_port_80_bool = each.value.listen_port_80_bool
   })
 
   filename        = "../conf.d/${each.key}.tryton.geeraert.eu.conf"
@@ -85,6 +90,8 @@ resource "kubernetes_config_map" "automatic-configmap" {
       http2_bool              = value.http2_bool
       proxy_pass_https        = value.proxy_pass_https
       authentication_required = value.authentication_required
+      redirect_to_https_bool  = value.redirect_to_https_bool
+      listen_port_80_bool     = value.listen_port_80_bool
     }) if value.enabled == true
   }
 
diff --git a/terraform/variables.auto.tfvars b/terraform/variables.auto.tfvars
index d390133..8e11b2f 100644
--- a/terraform/variables.auto.tfvars
+++ b/terraform/variables.auto.tfvars
@@ -92,6 +92,7 @@ client_max_body_size 20m;
     enabled = false
   }
   paperless-docker = {
+    enabled = false
     service = "192.168.88.50:4887"
   }
   paperless = {
@@ -149,8 +150,10 @@ client_max_body_size 20m;
     service = "netdata-agent.netdata.svc:19999"
   }
   screeps = {
-    enabled = false
-    service = "screeps-svc.screeps.svc:443"
+    #  enabled = false
+    redirect_to_https_bool = false
+    listen_port_80_bool    = true
+    service                = "screeps-svc.screeps.svc:21025"
   }
   stirling = {
     enabled = false
@@ -177,7 +180,7 @@ client_max_body_size 20m;
     service = "web.piholenew.svc"
   }
   jellyfin = {
-    enabled = false
+    #    enabled = false
     service = "jellyfin-svc.jellyfin.svc:8096"
   }
   gogs = {
@@ -236,7 +239,7 @@ client_max_body_size 20m;
     service = "bookstack-svc.bookstack-terraform.svc"
   }
   stash = {
-    #  enabled              = false
+    #    enabled              = false
     service              = "stash-svc.stash.svc:9999"
     extra-value-location = <<EOT
     proxy_set_header Connection "upgrade";
@@ -267,6 +270,9 @@ proxy_set_header Connection "upgrade";
                 EOT
 
   }
-
+  pinchflat = {
+    enabled = false
+    service = "pinchflat-svc.pinchflat.svc:8945"
+  }
 
 }