fix
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
locals {
|
||||
dns-name = "${var.sub-domain}.${var.domain-name}"
|
||||
dns-collabora = "collabora.${local.dns-name}"
|
||||
dns-onlyoffice = "onlyoffice.${local.dns-name}"
|
||||
dns-names = [local.dns-name]
|
||||
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
|
||||
dns_name = "${var.sub_domain}.${var.domain_name}"
|
||||
dns-collabora = "collabora.${local.dns_name}"
|
||||
dns-onlyoffice = "onlyoffice.${local.dns_name}"
|
||||
dns_names = [local.dns_name]
|
||||
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
|
||||
icon = "apps/theming/favicon"
|
||||
service = {
|
||||
"name" = "${var.component}"
|
||||
@@ -31,9 +31,9 @@ module "ingress" {
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
issuer = var.issuer
|
||||
ingress-class = var.ingress-class
|
||||
ingress_class = var.ingress_class
|
||||
labels = local.common-labels
|
||||
dns-names = local.dns-names
|
||||
dns_names = local.dns_names
|
||||
middlewares = ["${var.instance}-sslenforce", "${var.instance}-redirectdav", "${var.instance}-redirectindex"]
|
||||
service = local.service
|
||||
providers = {
|
||||
@@ -45,8 +45,8 @@ module "application" {
|
||||
source = "/dist/modules/application"
|
||||
component = var.component
|
||||
instance = var.instance
|
||||
app-group = var.app-group
|
||||
dns-name = local.dns-name
|
||||
app_group = var.app_group
|
||||
dns_name = local.dns_name
|
||||
icon = local.icon
|
||||
protocol_provider = module.oauth2.provider-id
|
||||
providers = {
|
||||
@@ -60,7 +60,7 @@ module "oauth2" {
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
labels = local.common-labels
|
||||
dns-name = local.dns-name
|
||||
dns_name = local.dns_name
|
||||
redirect-path = "apps/user_oidc/code"
|
||||
providers = {
|
||||
kubernetes = kubernetes
|
||||
@@ -90,9 +90,9 @@ module "collabora-ingress" {
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
issuer = var.issuer
|
||||
ingress-class = var.ingress-class
|
||||
ingress_class = var.ingress_class
|
||||
labels = local.collabora-labels
|
||||
dns-names = [local.dns-collabora]
|
||||
dns_names = [local.dns-collabora]
|
||||
middlewares = []
|
||||
service = local.collabora-service
|
||||
providers = {
|
||||
@@ -121,9 +121,9 @@ module "onlyoffice-ingress" {
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
issuer = var.issuer
|
||||
ingress-class = var.ingress-class
|
||||
ingress_class = var.ingress_class
|
||||
labels = local.onlyoffice-labels
|
||||
dns-names = [local.dns-onlyoffice]
|
||||
dns_names = [local.dns-onlyoffice]
|
||||
middlewares = []
|
||||
service = local.onlyoffice-service
|
||||
providers = {
|
||||
|
||||
Reference in New Issue
Block a user