From fa3560a973a1884339a63b60daa36d818f851a61 Mon Sep 17 00:00:00 2001 From: Emilien Devos Date: Fri, 1 Dec 2023 17:39:41 +0100 Subject: [PATCH] fix ldap parameters --- georchestra-backup-ldap/Chart.yaml | 2 +- georchestra-backup-ldap/templates/cronjob.yaml | 6 +++--- georchestra-backup-ldap/values.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/georchestra-backup-ldap/Chart.yaml b/georchestra-backup-ldap/Chart.yaml index d4ee7e7..be4cdbc 100644 --- a/georchestra-backup-ldap/Chart.yaml +++ b/georchestra-backup-ldap/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.5 +version: 0.1.6 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/georchestra-backup-ldap/templates/cronjob.yaml b/georchestra-backup-ldap/templates/cronjob.yaml index cad4935..1aef082 100644 --- a/georchestra-backup-ldap/templates/cronjob.yaml +++ b/georchestra-backup-ldap/templates/cronjob.yaml @@ -36,9 +36,9 @@ spec: - | /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.usersRdn }},{{ $ldapTargetConfiguration.baseDn }}" > /backup/ldap-$(date +"%s").ldif; /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.pendingusersRdn }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif; - /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.orgs }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif; - /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.pendingorgs }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif; - /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.roles }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif; + /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.orgsRdn }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif; + /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.pendingorgsRdn }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif; + /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.rolesRdn }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif; cd /backup && rm `ls -t | awk 'NR>{{ .Values.configuration.keepLastBackups }}'` {{- with $job.resources }} resources: diff --git a/georchestra-backup-ldap/values.yaml b/georchestra-backup-ldap/values.yaml index e990558..28673c0 100644 --- a/georchestra-backup-ldap/values.yaml +++ b/georchestra-backup-ldap/values.yaml @@ -47,7 +47,7 @@ configuration: pendingusersRdn: "ou=pendingusers" rolesRdn: "ou=roles" orgsRdn: "ou=orgs" - pendingorgs: "ou=pendingorgs" + pendingorgsRdn: "ou=pendingorgs" persistence: ## Persistent Volume Storage Class