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-05-24 13:51:04 +02:00
parent a64d556cdb
commit 4ea951c55b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sonar/sonar_ConfigMap.tf
View File

@@ -38,7 +38,7 @@ resource "kubectl_manifest" "cm_files" {
sonar.auth.saml.applicationId=${module.saml.app_id} sonar.auth.saml.applicationId=${module.saml.app_id}
sonar.auth.saml.providerName=vynil sonar.auth.saml.providerName=vynil
sonar.auth.saml.providerId=${module.saml.issuer} sonar.auth.saml.providerId=${module.saml.issuer}
sonar.auth.saml.loginUrl=https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/saml/${local.app_name}/sso/binding/init/ sonar.auth.saml.loginUrl=https://${data.kubernetes_ingress_v1.authentik.spec[0].rule[0].host}/application/saml/${var.component}-${var.instance}/sso/binding/init/
sonar.auth.saml.certificate.secured=${join("",[for line in split("\n",module.saml.certificate_data): line if !endswith(line, "CERTIFICATE-----")])} sonar.auth.saml.certificate.secured=${join("",[for line in split("\n",module.saml.certificate_data): line if !endswith(line, "CERTIFICATE-----")])}
sonar.auth.saml.user.login=windowsaccountname sonar.auth.saml.user.login=windowsaccountname
sonar.auth.saml.user.name=name sonar.auth.saml.user.name=name

2
apps/sonar/sonar_Service.tf
View File

@@ -1,7 +1,7 @@
locals { locals {
dns_name = "${var.sub_domain}.${var.domain_name}" dns_name = "${var.sub_domain}.${var.domain_name}"
dns_names = [local.dns_name] dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance) app_name = (var.component == var.instance || var.component=="") ? var.instance : format("%s-%s", var.component, var.instance)
icon = "icon.svg" icon = "icon.svg"
} }