fix

meta/domain/installs.tf

@@ -1,58 +1,88 @@
 locals {
-    global = {
-        "domain"         = var.namespace
-        "domain-name"    = var.domain-name
-        "issuer"         = var.issuer
-        "ingress-class"  = var.ingress-class
-        "distributions"  = var.distributions
-        "backups"        = var.backups
-        "storage-classes"= var.storage-classes
-    }
-    annotations = {
-      "vynil.solidite.fr/meta" = var.component
-      "vynil.solidite.fr/name" = var.namespace
-      "vynil.solidite.fr/domain" = var.domain-name
-      "vynil.solidite.fr/issuer" = var.issuer
-      "vynil.solidite.fr/ingress" = var.ingress-class
-    }
-    auth = { for k, v in var.auth : k => v if k!="enable" }
-    infra = { for k, v in var.infra : k => v if k!="enable" }
-    ci = { for k, v in var.ci : k => v if k!="enable" }
-    erp = { for k, v in var.erp : k => v if k!="enable" }
-    apps = { for k, v in var.apps : k => v if k!="enable" }
-    mail = { for k, v in var.mail : k => v if k!="enable" }
-    devspaces = { for k, v in var.devspaces : k => v if k!="enable" }
+  global = {
+      "domain"         = var.namespace
+      "domain-name"    = var.domain-name
+      "issuer"         = var.issuer
+      "ingress-class"  = var.ingress-class
+      "distributions"  = var.distributions
+      "backups"        = var.backups
+      "storage-classes"= var.storage-classes
+  }
+  annotations = {
+    "vynil.solidite.fr/meta" = var.component
+    "vynil.solidite.fr/name" = var.namespace
+    "vynil.solidite.fr/domain" = var.domain-name
+    "vynil.solidite.fr/issuer" = var.issuer
+    "vynil.solidite.fr/ingress" = var.ingress-class
+  }
+  auth = { for k, v in var.auth : k => v if k!="enable" }
+  infra = { for k, v in var.infra : k => v if k!="enable" }
+  ci = { for k, v in var.ci : k => v if k!="enable" }
+  erp = { for k, v in var.erp : k => v if k!="enable" }
+  apps = { for k, v in var.apps : k => v if k!="enable" }
+  mail = { for k, v in var.mail : k => v if k!="enable" }
+  devspaces = { for k, v in var.devspaces : k => v if k!="enable" }
 
-    # 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-forward = var.infra.enable && var.infra.traefik.enable
-    use-other-auth = false
-    added-auth-ldap = local.use-ldap?{
-      "authentik-ldap" = {"enable"= true}
-    }:{}
-    added-auth-forward = local.use-forward?{
-      "authentik-forward" = {"enable"= true}
-    }:{}
-    added-auth = local.use-ldap||local.use-forward||local.use-other-auth?merge({
-      "authentik" = {"enable" = true}
-    },local.added-auth-ldap,local.added-auth-forward):{}
-    divisions = {
-      "clients" = {
-        "enable" = false
-        "apps" = []
-        "divisions" = []
-      }
-      "employes" = {
-        "enable" = true
-        "apps" = []
-        "divisions" = []
-      }
-      "fournisseurs" = {
-        "enable" = false
-        "apps" = []
-        "divisions" = []
-      }
+  # 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-forward = var.infra.enable && var.infra.traefik.enable
+  use-other-auth = false
+  added-auth-ldap = local.use-ldap?{
+    "authentik-ldap" = {"enable"= true}
+  }:{}
+  added-auth-forward = local.use-forward?{
+    "authentik-forward" = {"enable"= true}
+  }:{}
+  added-auth = local.use-ldap||local.use-forward||local.use-other-auth?merge({
+    "authentik" = {"enable" = true}
+  },local.added-auth-ldap,local.added-auth-forward):{}
+  divisions = {
+    "clients" = {
+      "enable" = false
+      "apps" = []
+      "divisions" = []
     }
+    "employes" = {
+      "enable" = true
+      "apps" = []
+      "divisions" = []
+    }
+    "fournisseurs" = {
+      "enable" = false
+      "apps" = []
+      "divisions" = []
+    }
+  }
+  devspaces-custom = {
+    external-pgs = concat(var.erp.enable&&var.erp.dolibarr.enable?[{
+      "name" = "dolibarr-dolibarr-pg"
+      "dbname" = "dolibarr"
+      "username" = "dolibarr"
+      "namespace" = "${var.domain}-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.domain}-files"
+      "secret" = {
+        "name" = "nextcloud-nextcloud-pg-app"
+        "key" = "password"
+      }
+    }]:[], var.ci.enable&&var.ci.gitea.enable?[{
+      "name" = "gitea-gitea-pg"
+      "dbname" = "gitea"
+      "username" = "gitea"
+      "namespace" = "${var.domain}-ci"
+      "secret" = {
+        "name" = "gitea-gitea-pg-app"
+        "key" = "password"
+      }
+    }]:[])
+  }
 }
 
 resource "kubectl_manifest" "auth" {
@@ -164,6 +194,6 @@ resource "kubectl_manifest" "devspaces" {
       distrib: "${var.distributions.domain}"
       category: "meta"
       component: "domain-devspaces"
-      options: ${jsonencode(merge(local.global, local.devspaces))}
+      options: ${jsonencode(merge(local.global, local.devspaces-custom, local.devspaces))}
   EOF
 }