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

fix(univention-management-stack): Use ldap base DN "dc=swp-ldap,dc=internal"

Browse Source
This commit is contained in:
Johannes Bornhold
2023-09-13 15:55:31 +02:00
parent 09079a1303
commit 77e362f6bc
7 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ SPDX-License-Identifier: Apache-2.0
--- ---
ldapServer: ldapServer:
ldapSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}" ldapSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}"
ldapBaseDn: "dc=swp-ldap,dc=internal"
# TODO: Certificates handling # TODO: Certificates handling
# caCert: "" # caCert: ""

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

@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0
*/}} */}}
--- ---
portalListener: portalListener:
adminGroup: "cn=Domain Admins,cn=groups,dc=univention-organization,dc=intranet" adminGroup: "cn=Domain Admins,cn=groups,dc=swp-ldap,dc=internal"
environment: "staging" environment: "staging"
debugLevel: "4" debugLevel: "4"
assetsRoot: "http://portal-listener:{{ .Values.secrets.univentionManagementStack.storeDavUsers.portalListener }}@ums-store-dav/portal-assets/" assetsRoot: "http://portal-listener:{{ .Values.secrets.univentionManagementStack.storeDavUsers.portalListener }}@ums-store-dav/portal-assets/"
@@ -12,13 +12,13 @@ portalListener:
umcGetUrl: "http://ums-umc-server/get" umcGetUrl: "http://ums-umc-server/get"
umcSessionUrl: "http://ums-umc-server/get/session-info" umcSessionUrl: "http://ums-umc-server/get/session-info"
ldapBaseDn: "dc=univention-organization,dc=intranet" ldapBaseDn: "dc=swp-ldap,dc=internal"
ldapHost: "ums-ldap-server" ldapHost: "ums-ldap-server"
ldapHostDn: "cn=admin,dc=univention-organization,dc=intranet" ldapHostDn: "cn=admin,dc=swp-ldap,dc=internal"
ldapSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}" ldapSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}"
machineSecret: "{{ .Values.secrets.univentionManagementStack.ldapSecret }}" 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=swp-ldap,dc=internal"
udmApiUrl: "http://ums-udm-rest-api/udm/" udmApiUrl: "http://ums-udm-rest-api/udm/"
udmApiUsername: "cn=admin" udmApiUsername: "cn=admin"

2
helmfile/apps/univention-management-stack/values-portal-server.gotmpl
View File

@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0
*/}} */}}
--- ---
portalServer: portalServer:
adminGroup: "cn=Domain Admins,cn=groups,dc=univention,dc=intranet" adminGroup: "cn=Domain Admins,cn=groups,dc=swp-ldap,dc=internal"
authMode: "saml" authMode: "saml"
environment: "staging" environment: "staging"
editable: "true" editable: "true"

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

@@ -9,6 +9,9 @@ stackDataSwp:
udmApiUrl: "http://ums-udm-rest-api/udm/" udmApiUrl: "http://ums-udm-rest-api/udm/"
loadDevData: true loadDevData: true
stackDataContext:
ldapBase: "dc=swp-ldap,dc=internal"
image: image:
registry: "{{ .Values.global.imageRegistry }}" registry: "{{ .Values.global.imageRegistry }}"
repository: "{{ .Values.images.umsDataLoader.repository }}" repository: "{{ .Values.images.umsDataLoader.repository }}"

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

@@ -10,6 +10,7 @@ stackDataUms:
loadDevData: true loadDevData: true
stackDataContext: stackDataContext:
ldapBase: "dc=swp-ldap,dc=internal"
initialPasswordAdministrator: "{{ .Values.secrets.univentionManagementStack.defaultAccounts.administratorPassword }}" initialPasswordAdministrator: "{{ .Values.secrets.univentionManagementStack.defaultAccounts.administratorPassword }}"
# The SWP configuration brings its own UMC policies. # The SWP configuration brings its own UMC policies.

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

@@ -6,14 +6,14 @@ SPDX-License-Identifier: Apache-2.0
udmRestApi: udmRestApi:
apiLogLevel: "4" apiLogLevel: "4"
authGroups: authGroups:
dcBackup: "cn=DC Backup Hosts,cn=groups,dc=univention-organization,dc=intranet" dcBackup: "cn=DC Backup Hosts,cn=groups,dc=swp-ldap,dc=internal"
dcSlaves: "cn=DC Slave Hosts,cn=groups,dc=univention-organization,dc=intranet" dcSlaves: "cn=DC Slave Hosts,cn=groups,dc=swp-ldap,dc=internal"
domainAdmins: "cn=Domain Admins,cn=groups,dc=univention-organization,dc=intranet" domainAdmins: "cn=Domain Admins,cn=groups,dc=swp-ldap,dc=internal"
ldapHost: "ums-ldap-server" ldapHost: "ums-ldap-server"
ldapBaseDn: "dc=univention-organization,dc=intranet" ldapBaseDn: "dc=swp-ldap,dc=internal"
# TODO: This should not be required, the machine account is not there # TODO: This should not be required, the machine account is not there
# ldapHostDn: cn=stub-value,cn=dc,cn=computers,dc=univention-organization,dc=intranet # ldapHostDn: cn=stub-value,cn=dc,cn=computers,dc=swp-ldap,dc=internal
ldapHostDn: "cn=admin,dc=univention-organization,dc=intranet" ldapHostDn: "cn=admin,dc=swp-ldap,dc=internal"
# 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: Secret should be entered without b64enc # TODO: Secret should be entered without b64enc

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

@@ -7,10 +7,10 @@ umcServer:
domainname: "{{ .Values.global.domain }}" domainname: "{{ .Values.global.domain }}"
hostname: "{{ .Values.global.hosts.univentionManagementStack }}" hostname: "{{ .Values.global.hosts.univentionManagementStack }}"
ldapHost: "ums-ldap-server" ldapHost: "ums-ldap-server"
ldapBaseDn: "dc=univention-organization,dc=intranet" ldapBaseDn: "dc=swp-ldap,dc=internal"
# TODO: This should not be required, the machine account is not there # TODO: This should not be required, the machine account is not there
# ldapHostDn: cn=stub-value,cn=dc,cn=computers,dc=univention-organization,dc=intranet # ldapHostDn: cn=stub-value,cn=dc,cn=computers,dc=swp-ldap,dc=internal
ldapHostDn: cn=admin,dc=univention-organization,dc=intranet ldapHostDn: cn=admin,dc=swp-ldap,dc=internal
enforceSessionCookie: "true" enforceSessionCookie: "true"
# TODO: The keycloak integration is pending # TODO: The keycloak integration is pending