fix

meta/domain/installs.tf

@@ -71,7 +71,7 @@ locals {
   })
 
   # Force install authentik and it's modules when any are needed
-  use-ldap = (var.ci.enable && var.ci.gitea.enable) || (var.erp.enable && var.erp.dolibarr.enable)
+  use-ldap = var.erp.enable && var.erp.dolibarr.enable
   use-forward = var.infra.enable && var.infra.traefik.enable
   use-other-auth = false
   added-auth-ldap = local.use-ldap?{
@@ -100,73 +100,6 @@ locals {
       "divisions" = []
     }
   }
-  devspaces-custom = {
-    external-pgs = concat(var.erp.enable&&var.erp.dolibarr.enable?[{
-      "name" = "dolibarr-dolibarr-pg"
-      "dbname" = "dolibarr"
-      "username" = "dolibarr"
-      "namespace" = "${var.namespace}-erp"
-      "secret" = {
-        "name" = "dolibarr-dolibarr-pg-app"
-        "key" = "password"
-      }
-    }]:[], var.apps.enable&&var.apps.nextcloud.enable?[{
-      "name" = "nextcloud-nextcloud-pg"
-      "dbname" = "nextcloud"
-      "username" = "nextcloud"
-      "namespace" = "${var.namespace}-files"
-      "secret" = {
-        "name" = "nextcloud-nextcloud-pg-app"
-        "key" = "password"
-      }
-    }]:[], var.auth.enable&&lookup(lookup(merge(var.auth,local.added-auth), "authentik",{}),"enable",false)?[{
-      "name" = "authentik-authentik-pg"
-      "dbname" = "authentik"
-      "username" = "authentik"
-      "namespace" = "${var.namespace}-auth"
-      "secret" = {
-        "name" = "authentik-authentik-pg-app"
-        "key" = "password"
-      }
-    }]:[], var.ci.enable&&var.ci.gitea.enable?[{
-      "name" = "gitea-gitea-pg"
-      "dbname" = "gitea"
-      "username" = "gitea"
-      "namespace" = "${var.namespace}-ci"
-      "secret" = {
-        "name" = "gitea-gitea-pg-app"
-        "key" = "password"
-      }
-    }]:[], lookup(var.devspaces, "external-pgs", []))
-    external-mongos = concat(var.mail.enable&&var.mail.wildduck.enable?[{
-      "name" = "wildduck-wildduck-mongo"
-      "dbname" = "wildduck"
-      "username" = "wildduck"
-      "namespace" = "${var.namespace}-mail"
-      "secret" = {
-        "name" = "wildduck-wildduck-mongo"
-        "key" = "password"
-      }
-    }]:[], lookup(var.devspaces, "external-mongos", []))
-    external-redis = concat(var.mail.enable&&var.mail.wildduck.enable?[{
-      "name" = "wildduck-wildduck-redis"
-      "namespace" = "${var.namespace}-mail"
-    }]:[], var.auth.enable&&lookup(lookup(merge(var.auth,local.added-auth), "authentik",{}),"enable",false)?[{
-      "name" = "authentik-authentik-redis"
-      "namespace" = "${var.namespace}-auth"
-      "secret" = {
-        "name" = "authentik"
-        "key" = "AUTHENTIK_REDIS__PASSWORD"
-      }
-    }]:[], var.erp.enable&&var.erp.dolibarr.enable?[{
-      "name" = "dolibarr-dolibarr-redis"
-      "namespace" = "${var.namespace}-erp"
-    }]:[], var.apps.enable&&var.apps.nextcloud.enable?[{
-      "name" = "nextcloud-nextcloud-redis"
-      "namespace" = "${var.namespace}-files"
-    }]:[], lookup(var.devspaces, "external-redis", []))
-    "haveGitea" = var.ci.enable && var.ci.gitea.enable
-  }
 }
 
 resource "kubectl_manifest" "auth" {
@@ -294,6 +227,6 @@ resource "kubectl_manifest" "devspaces" {
       distrib: "${var.distributions.domain}"
       category: "meta"
       component: "domain-devspaces"
-      options: ${jsonencode(merge(local.devspaces, local.devspaces-custom))}
+      options: ${jsonencode(local.devspaces)}
   EOF
 }