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

fix(univention-management-stack): Use global secrets to populate ldap related secrets

Browse Source
This commit is contained in:
Johannes Bornhold
2023-09-04 14:58:03 +02:00
parent a4bab4068d
commit 9409ad829a
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
helmfile/apps/univention-management-stack/values-portal-listener.gotmpl
View File

@@ -15,8 +15,8 @@ portalListener:
ldapBaseDn: "dc=univention-organization,dc=intranet" ldapBaseDn: "dc=univention-organization,dc=intranet"
ldapHost: "ums-ldap-server" ldapHost: "ums-ldap-server"
ldapHostDn: "cn=admin,dc=univention-organization,dc=intranet" ldapHostDn: "cn=admin,dc=univention-organization,dc=intranet"
ldapSecret: "univention" ldapSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}"
machineSecret: "univention" machineSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}"
notifierServer: "ums-ldap-notifier" notifierServer: "ums-ldap-notifier"
portalDefaultDn: "cn=domain,cn=portal,cn=portals,cn=univention,dc=univention-organization,dc=intranet" portalDefaultDn: "cn=domain,cn=portal,cn=portals,cn=univention,dc=univention-organization,dc=intranet"
udmApiUrl: "http://ums-udm-rest-api/udm/" udmApiUrl: "http://ums-udm-rest-api/udm/"

3
helmfile/apps/univention-management-stack/values-stack-data-swp.gotmpl
View File

@@ -4,7 +4,8 @@ SPDX-License-Identifier: Apache-2.0
*/}} */}}
--- ---
stackDataSwp: stackDataSwp:
udmApiPassword: "univention" udmApiUsername: "cn=admin"
udmApiPassword: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}"
udmApiUrl: "http://ums-udm-rest-api/udm/" udmApiUrl: "http://ums-udm-rest-api/udm/"
loadDevData: true loadDevData: true

3
helmfile/apps/univention-management-stack/values-stack-data-ums.gotmpl
View File

@@ -4,7 +4,8 @@ SPDX-License-Identifier: Apache-2.0
*/}} */}}
--- ---
stackDataUms: stackDataUms:
udmApiPassword: "univention" udmApiUser: "cn=admin"
udmApiPassword: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}"
udmApiUrl: "http://ums-udm-rest-api/udm/" udmApiUrl: "http://ums-udm-rest-api/udm/"
loadDevData: true loadDevData: true

1
helmfile/apps/univention-management-stack/values-udm-rest-api.gotmpl
View File

@@ -17,7 +17,6 @@ udmRestApi:
ldapHostDn: "cn=admin,dc=univention-organization,dc=intranet" ldapHostDn: "cn=admin,dc=univention-organization,dc=intranet"
# TODO: Secret should be entered without b64enc # TODO: Secret should be entered without b64enc
ldapSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret | b64enc }}" ldapSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret | b64enc }}"
# TODO: There is on machine secret on the container
# TODO: Secret should be entered without b64enc # TODO: Secret should be entered without b64enc
machineSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret | b64enc }}" machineSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret | b64enc }}"
# TODO: why do we need this many subprocesses? # TODO: why do we need this many subprocesses?

1
helmfile/apps/univention-management-stack/values-umc-server.gotmpl
View File

@@ -23,7 +23,6 @@ umcServer:
# TODO: Secret should be entered without b64enc # TODO: Secret should be entered without b64enc
ldapSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret | b64enc }}" ldapSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret | b64enc }}"
# TODO: There is on machine secret on the container
# TODO: Secret should be entered without b64enc # TODO: Secret should be entered without b64enc
machineSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret | b64enc }}" machineSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret | b64enc }}"

3
helmfile/environments/default/secrets.gotmpl
View File

@@ -24,8 +24,7 @@ secrets:
openproject: {{ (derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ucs" "ldapsearch_openproject" | sha1sum) }} openproject: {{ (derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ucs" "ldapsearch_openproject" | sha1sum) }}
xwiki: {{ (derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ucs" "ldapsearch_xwiki" | sha1sum) }} xwiki: {{ (derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "ucs" "ldapsearch_xwiki" | sha1sum) }}
univentionManagementStack: univentionManagementStack:
# TODO: Use "derivePassword" ldapSecret: {{ (derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "cn=admin" "ldap" | sha1sum) }}
ldapSecret: "univention"
defaultAccounts: defaultAccounts:
administratorPassword: {{ (derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "Administrator" "ums" | sha1sum) }} administratorPassword: {{ (derivePassword 1 "long" (env "MASTER_PASSWORD" | default "sovereign-workplace") "Administrator" "ums" | sha1sum) }}
storeDavUsers: storeDavUsers: