vynil/domain
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-01-25 18:35:22 +01:00
parent 0727fca591
commit 8c4348d215
97 changed files with 402 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
share/dataset-pg/directus.tf
View File

@@ -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

8
share/dataset-pg/index.yaml
View File

@@ -65,17 +65,17 @@ options:
examples:
- your-company
type: string
sub-domain:
sub_domain:
default: dataset-pg
examples:
- dataset-pg
type: string
app-group:
app_group:
default: api
examples:
- api
type: string
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com
@@ -85,7 +85,7 @@ options:
examples:
- 8Gi
type: string
ingress-class:
ingress_class:
default: traefik
examples:
- traefik

2
share/dataset-pg/postgresql.tf
View File

@@ -1,5 +1,5 @@
locals {
dns-name = "${var.instance}.${var.sub-domain}.${var.domain-name}"
dns_name = "${var.instance}.${var.sub_domain}.${var.domain_name}"
pg-labels = merge(local.common-labels, {
"app.kubernetes.io/component" = "postgresql"
})

14
share/dataset-pg/postgrest.tf
View File

@@ -2,7 +2,7 @@ locals {
prest-labels = merge(local.common-labels, {
"app.kubernetes.io/component" = "postgrest"
})
prest-dns-name = "api.${local.dns-name}"
prest-dns_name = "api.${local.dns_name}"
prest-service = {
"name" = "postgrest-${var.instance}"
"port" = {
@@ -32,9 +32,9 @@ resource "kubectl_manifest" "postgrest_config" {
PGPORT: "5432"
PGRST_DB_SCHEMA: public
PGRST_DB_ANON_ROLE: anonymous
PGRST_OPENAPI_SERVER_PROXY_URI: "https://${local.prest-dns-name}"
PGRST_OPENAPI_SERVER_PROXY_URI: "https://${local.prest-dns_name}"
PGRST_ADMIN_SERVER_PORT: "9000"
API_URL: "https://${local.prest-dns-name}"
API_URL: "https://${local.prest-dns_name}"
BASE_URL: "/ui"
EOF
}
@@ -152,9 +152,9 @@ module "postgrest-ingress" {
instance = var.instance
namespace = var.namespace
issuer = var.issuer
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.prest-labels
dns-names = [local.prest-dns-name]
dns_names = [local.prest-dns_name]
create-redirect = true
middlewares = []
service = local.prest-service
@@ -184,9 +184,9 @@ module "swagger-ingress" {
instance = var.instance
namespace = var.namespace
issuer = var.issuer
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.prest-labels
dns-names = [local.prest-dns-name]
dns_names = [local.prest-dns_name]
middlewares = []
create-cert = false
sub-path = "ui"