fix
This commit is contained in:
@@ -5,7 +5,7 @@ locals {
|
||||
"app.kubernetes.io/component" = "directus"
|
||||
})
|
||||
directus-icon = "admin/img/directus-white.png"
|
||||
directus-dns-name = "directus.${local.dns-name}"
|
||||
directus-dns_name = "directus.${local.dns_name}"
|
||||
directus-service = {
|
||||
"name" = "directus-${var.instance}"
|
||||
"port" = {
|
||||
@@ -45,15 +45,15 @@ resource "kubectl_manifest" "directus_config" {
|
||||
DB_PORT: "5432"
|
||||
STORAGE_LOCATIONS: "local"
|
||||
STORAGE_LOCAL_ROOT: "/var/store"
|
||||
ADMIN_EMAIL: "admin@${var.domain-name}"
|
||||
ADMIN_EMAIL: "admin@${var.domain_name}"
|
||||
NODE_EXTRA_CA_CERTS: "/etc/local-ca/ca.crt"
|
||||
TELEMETRY: "false"
|
||||
AUTH_PROVIDERS: "VYNIL"
|
||||
AUTH_VYNIL_DRIVER: "openid"
|
||||
AUTH_VYNIL_ALLOW_PUBLIC_REGISTRATION: "true"
|
||||
AUTH_VYNIL_ISSUER_URL: "https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/o/directus-${replace(var.sub-domain, ".", "-")}-${var.instance}/.well-known/openid-configuration"
|
||||
AUTH_VYNIL_ISSUER_URL: "https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/o/directus-${replace(var.sub_domain, ".", "-")}-${var.instance}/.well-known/openid-configuration"
|
||||
AUTH_VYNIL_IDENTIFIER_KEY: "email"
|
||||
PUBLIC_URL: "https://${local.directus-dns-name}"
|
||||
PUBLIC_URL: "https://${local.directus-dns_name}"
|
||||
EOF
|
||||
}
|
||||
|
||||
@@ -133,12 +133,12 @@ resource "kubectl_manifest" "directus_deploy" {
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
key: "client-id"
|
||||
name: "directus-${replace(var.sub-domain, ".", "-")}-${var.instance}-id"
|
||||
name: "directus-${replace(var.sub_domain, ".", "-")}-${var.instance}-id"
|
||||
- name: AUTH_VYNIL_CLIENT_SECRET
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
key: "client-secret"
|
||||
name: "directus-${replace(var.sub-domain, ".", "-")}-${var.instance}-secret"
|
||||
name: "directus-${replace(var.sub_domain, ".", "-")}-${var.instance}-secret"
|
||||
- name: DB_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
@@ -216,9 +216,9 @@ module "directus-ingress" {
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
issuer = var.issuer
|
||||
ingress-class = var.ingress-class
|
||||
ingress_class = var.ingress_class
|
||||
labels = local.directus-labels
|
||||
dns-names = [local.directus-dns-name]
|
||||
dns_names = [local.directus-dns_name]
|
||||
create-redirect = true
|
||||
middlewares = []
|
||||
service = local.directus-service
|
||||
@@ -230,10 +230,10 @@ module "directus-ingress" {
|
||||
module "directus-application" {
|
||||
count = var.extentions.directus.enable ? 1 : 0
|
||||
source = "/dist/modules/application"
|
||||
component = "directus-${replace(var.sub-domain, ".", "-")}"
|
||||
component = "directus-${replace(var.sub_domain, ".", "-")}"
|
||||
instance = var.instance
|
||||
app-group = var.app-group
|
||||
dns-name = local.directus-dns-name
|
||||
app_group = var.app_group
|
||||
dns_name = local.directus-dns_name
|
||||
icon = local.directus-icon
|
||||
protocol_provider = module.directus-oauth2[0].provider-id
|
||||
providers = {
|
||||
@@ -244,11 +244,11 @@ module "directus-application" {
|
||||
module "directus-oauth2" {
|
||||
count = var.extentions.directus.enable ? 1 : 0
|
||||
source = "/dist/modules/oauth2"
|
||||
component = "directus-${replace(var.sub-domain, ".", "-")}"
|
||||
component = "directus-${replace(var.sub_domain, ".", "-")}"
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
labels = local.directus-labels
|
||||
dns-name = local.directus-dns-name
|
||||
dns_name = local.directus-dns_name
|
||||
redirect-path = "auth/login/VYNIL/callback"
|
||||
providers = {
|
||||
kubernetes = kubernetes
|
||||
|
||||
Reference in New Issue
Block a user