mirror of
https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git
synced 2025-12-06 07:21:36 +01:00
fix(helmfile): Set default for domain to opendesk.internal to avoid enforcing DOMAIN environment variable for deployments using YAML overrides
This commit is contained in:
@@ -27,7 +27,6 @@ lint-kyverno:
|
||||
- "services-external"
|
||||
- "xwiki"
|
||||
script:
|
||||
- "export DOMAIN=opendesk.internal"
|
||||
- "cd ${CI_PROJECT_DIR}/helmfile/apps/${APP}"
|
||||
- >
|
||||
node /app/opendesk-ci-cli/src/index.js generate-kyverno-env
|
||||
|
||||
@@ -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.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 }}"
|
||||
## SMTP settings
|
||||
"property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
|
||||
|
||||
@@ -10,7 +10,7 @@ global:
|
||||
|
||||
## Define host
|
||||
#
|
||||
domain: {{ requiredEnv "DOMAIN" | quote }}
|
||||
domain: {{ env "DOMAIN" | default "opendesk.internal" | quote }}
|
||||
|
||||
## Define mail host
|
||||
## If this is unset the "domain" value above should be used in all references
|
||||
|
||||
Reference in New Issue
Block a user