adding next and also modifying the nginx file

nginx_config.tftpl

@@ -43,3 +43,48 @@ server {
         return 404;
 
 }
+############################################
+#       config file for ${name_site}
+############################################
+
+upstream ${name_site}_backend_root {
+        server ${name_service};
+        server 1.1.1.1 backup;
+    }
+
+server {
+        server_name ${name_site}.geeraert.eu www.${name_site}.geeraert.eu;
+        location / {
+                proxy_pass http://${name_site}_backend_root;
+                proxy_set_header    Upgrade     $http_upgrade;
+		proxy_set_header Host $host;
+        }
+        location /.well-known/acme-challenge/ {
+                root /var/www/certbot;
+        }
+
+	access_log /var/log/nginx/access.log my_custom_format;
+        access_log /var/log/nginx/ip_audit.log ip_audit;
+
+        listen 443 ssl;
+
+        ssl_certificate /etc/nginx/ssl/live/geeraert.eu/fullchain.pem;
+        ssl_certificate_key /etc/nginx/ssl/live/geeraert.eu/privkey.pem;
+
+}
+
+server {
+        if ($host = www.${name_site}.geeraert.eu) {
+                return 301 https://$host$request_uri;
+        }
+
+
+        if ($host = ${name_site}.geeraert.eu) {
+                return 301 https://$host$request_uri;
+        }
+
+        server_name www.${name_site}.geeraert.eu ${name_site}.geeraert.eu;
+        listen 80;
+        return 404;
+
+}

variables.auto.tfvars

@@ -671,72 +671,40 @@ kubernetes = {
 
 
 
-  next = {
+  nextcloud = {
-    enabled        = false
+    #enabled        = false
     namespace      = "next"
-    replicas       = 01
+    replicas       = 1
     image          = "nextcloud:29.0.3-apache"
+    domain_name  = "next"
     service_port   = [80]
-    extra_manifest = ["/opt/kubernetes/Nextcloud_kube/next.secret.yaml"]
+    #extra_manifest = ["/opt/kubernetes/Nextcloud_kube/next.secret.yaml"]
+    secret_ref        = ["nextcloud-credentials"]
+    secret_import     = ["b207c4b6-0489-4ab2-a032-b4a400a708e0"]
     database = {
     image = "docker.io/library/postgres:14" }
     redis = {
     image = "docker.io/library/redis:7" }
-    requirements = {
+    #requirements = {
-      limits-cpu      = "800Mi"
+    #  limits-cpu      = "800Mi"
-      limits-memory   = "800Mi"
+    #  limits-memory   = "800Mi"
-      requests-cpu    = "800Mi"
+    #  requests-cpu    = "800Mi"
-      requests-memory = "800Mi"
+    #  requests-memory = "800Mi"
-    }
+    #}
     environment = {
-      POSTGRES_DB = {
-        value_from = {
-          secret_key_ref = {
-            name = "nextcloud-credentials"
-            key  = "POSTGRES_DB"
-          }
-        }
-      }
-      POSTGRES_USER = {
-        value_from = {
-          secret_key_ref = {
-            name = "nextcloud-credentials"
-            key  = "POSTGRES_USER"
-          }
-        }
-      }
-      POSTGRES_PASSWORD = {
-        value_from = {
-          secret_key_ref = {
-            name = "nextcloud-credentials"
-            key  = "POSTGRES_PASSWORD"
-          }
-        }
-      }
-      POSTGRES_HOST = {
-        value_from = {
-          secret_key_ref = {
-            name = "nextcloud-credentials"
-            key  = "POSTGRES_HOST"
-          }
-        }
-      }
 
-      #      REDIS_HOST = {
-      #        value = "redis://next-redis-svc:6379"
-      #      }
       TRUSTED_PROXIES = {
         value = "192.168.88.50 192.168.88.52"
       }
       OVERWRITECLIURL = {
-        value = "https://nextcloud.tryton.geeraert.eu"
+        value = "https://next.geeraert.eu"
       }
       OVERWRITEPROTOCOL = {
         value = "https"
       }
 
       NEXTCLOUD_TRUSTED_DOMAINS = {
-        value = "nextcloud.tryton.geeraert.eu 192.168.88.52"
+        value = "next.geeraert.eu next.tryton.geeraert.eu 192.168.88.52"
       }
       NEXTCLOUD_ADMIN_USER = {
         value = "admin"
@@ -749,6 +717,7 @@ kubernetes = {
           }
         }
       }
+
     }
     pvc = {
       nextcloud-webserver = {
@@ -830,7 +799,7 @@ kubernetes = {
   }
 
   jellyfin = {
-    #  enabled      = false
+    enabled      = false
     replicas     = 0
     image        = "jellyfin/jellyfin:latest"
     service_port = [8096]
@@ -838,7 +807,7 @@ kubernetes = {
     environment = {
 
       JELLYFIN_PublishedServerUrl = {
-        value = "https://jellyfin.tryton.geeraert.eu"
+        value = "https://jellyfin.geeraert.eu"
       }
     }
     pvc = {
@@ -1553,7 +1522,7 @@ kubernetes = {
 
     environment = {
       ALLOWED_HOSTS = {
-        value = "django.tryton.geeraert.eu,redirect.tryton.geeraert.eu"
+        value = "django.geeraert.eu,django.tryton.geeraert.eu,redirect.tryton.geeraert.eu"
       }
       DEBUG = {
         value = "False"
@@ -1676,7 +1645,7 @@ kubernetes = {
     secret_import  = ["68dce7aa-8e5f-4483-9083-b474016e34fc"]
     environment = {
       ALLOWED_HOSTS = {
-        value = "django-testing.tryton.geeraert.eu,redirect.tryton.geeraert.eu,redirect-testing.tryton.geeraert.eu,job-testing.tryton.geeraert.eu"
+        value = "django-testing.geeraert.eu,redirectgeeraert.eu,redirect-testing.geeraert.eu,job-testing.geeraert.eu,django-testing.tryton.geeraert.eu,redirect.tryton.geeraert.eu,redirect-testing.tryton.geeraert.eu,job-testing.tryton.geeraert.eu"
       }
       CELERY_BROKER_URL = {
         value = "redis://django-testing-redis-svc:6379"
@@ -2643,24 +2612,6 @@ kubernetes = {
   }
 
 
-  nextcloudt = {
-    enabled      = false
-    replicas     = 1
-    image        = "nextcloud:29.0.3-apache"
-    service_port = [80]
-    domain_name  = "nextcloudnew"
-    database = {
-    image = "docker.io/library/postgres:14" }
-
-    pvc = {
-      nextcloud-webserver = {
-        name       = "nextcloud-webserver"
-        pvc        = true
-        pvc_size   = "2Gi"
-        mount_path = "/var/www/html"
-      }
-    }
-  }
   reactive = {
     #disabled because it needs AI to import a pdf and AI integration is not working
     enabled      = false