sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-06 23:41:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(helmfile): Set default for domain to opendesk.internal to avoid enforcing DOMAIN environment variable for deployments using YAML overrides

Browse Source
This commit is contained in:
Thorsten Roßner
2025-02-10 09:42:51 +01:00
parent 581c8aed1f
commit 930ae9d3e7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab/lint/lint-kyverno.yml
View File

@@ -27,7 +27,6 @@ lint-kyverno:
- "services-external" - "services-external"
- "xwiki" - "xwiki"
script: script:
- "export DOMAIN=opendesk.internal"
- "cd ${CI_PROJECT_DIR}/helmfile/apps/${APP}" - "cd ${CI_PROJECT_DIR}/helmfile/apps/${APP}"
- > - >
node /app/opendesk-ci-cli/src/index.js generate-kyverno-env node /app/opendesk-ci-cli/src/index.js generate-kyverno-env

3
helmfile/apps/xwiki/values.yaml.gotmpl
View File

@@ -161,7 +161,8 @@ properties:
"property:xwiki:XWiki.XWikiServerXwiki^XWiki.XWikiServerClass.server": "{{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}" "property:xwiki:XWiki.XWikiServerXwiki^XWiki.XWikiServerClass.server": "{{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}"
"property:xwiki:XWiki.XWikiServerXwiki^XWiki.XWikiServerClass.port": 443 "property:xwiki:XWiki.XWikiServerXwiki^XWiki.XWikiServerClass.port": 443
## This option overwrites the LDAP group mappings including all dynamically created mappings, therefore on XWiki restart an LDAP sync is triggered to load the dynamic mapping. ## This option overwrites the LDAP group mappings including all dynamically created mappings,
# therefore on XWiki restart an LDAP sync is triggered to load the dynamic mapping.
"property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.ldap_group_mapping": "xwiki:XWiki.XWikiAdminGroup=cn=managed-by-attribute-KnowledgemanagementAdmin,cn=groups,{{ .Values.ldap.baseDn }}" "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.ldap_group_mapping": "xwiki:XWiki.XWikiAdminGroup=cn=managed-by-attribute-KnowledgemanagementAdmin,cn=groups,{{ .Values.ldap.baseDn }}"
## SMTP settings ## SMTP settings
"property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}" "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"

2
helmfile/environments/default/global.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ global:
## Define host ## Define host
# #
domain: {{ requiredEnv "DOMAIN" | quote }} domain: {{ env "DOMAIN" | default "opendesk.internal" | quote }}
## Define mail host ## Define mail host
## If this is unset the "domain" value above should be used in all references ## If this is unset the "domain" value above should be used in all references