diff --git a/.github/workflows/image-and-helm-publish-check-deploy-on-push-scheduled.yml b/.github/workflows/image-and-helm-publish-check-deploy-on-push-scheduled.yml index 3cb6d57..570b600 100644 --- a/.github/workflows/image-and-helm-publish-check-deploy-on-push-scheduled.yml +++ b/.github/workflows/image-and-helm-publish-check-deploy-on-push-scheduled.yml @@ -77,7 +77,7 @@ jobs: - branch_meta - create_branch_identifier - wait_for_helm_chart_to_get_published - uses: dBildungsplattform/spsh-app-deploy/.github/workflows/deploy.yml@SPSH-1044 + uses: dBildungsplattform/spsh-app-deploy/.github/workflows/deploy.yml@5 with: dbildungs_iam_server_branch: ${{ needs.branch_meta.outputs.ticket }} schulportal_client_branch: ${{ needs.branch_meta.outputs.ticket }} diff --git a/charts/dbildungs-iam-ldap/templates/configmap-config-script.yaml b/charts/dbildungs-iam-ldap/templates/configmap-config-script.yaml index 74c8d90..91ba121 100644 --- a/charts/dbildungs-iam-ldap/templates/configmap-config-script.yaml +++ b/charts/dbildungs-iam-ldap/templates/configmap-config-script.yaml @@ -89,18 +89,3 @@ data: if [[ -n "$current_dn" ]]; then process_entry "$current_dn" "$current_entry" fi - - - ucsmail.ldif: | - # add custom schema - dn: cn=ucsMail,cn=schema,cn=config - objectClass: olcSchemaConfig - cn: ucsMail - olcAttributeTypes: ( 1.3.6.1.4.1.10176.1010.1.1 NAME 'mailPrimaryAddress' DESC 'Primary mailaddresses for the user' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) - olcAttributeTypes: ( 1.3.6.1.4.1.10176.1010.1.2 NAME 'mailAlternativeAddress' DESC 'Secondary (alias) mailaddresses for the same user' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - olcAttributeTypes: ( 1.3.6.1.4.1.10176.1010.1.3 NAME 'mailGlobalSpamFolder'DESC 'Move Spam to global spam folder instead of local spam folder' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - olcAttributeTypes: ( 1.3.6.1.4.1.10176.1010.1.47 NAME 'mailForwardAddress'DESC 'External mail addresses to forward the users emails to' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) - olcAttributeTypes: ( 1.3.6.1.4.1.10176.1010.1.51 NAME 'mailForwardCopyToSelf' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{10} SINGLE-VALUE ) - olcAttributeTypes: ( 1.3.6.1.4.1.10176.1010.1.60 NAME 'univentionMailHomeServer' DESC 'home server of users mailbox' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} SINGLE-VALUE ) - olcAttributeTypes: ( 1.3.6.1.4.1.10176.1010.1.92 NAME 'univentionMailUserQuota' DESC 'Mailbox hard quota limit in MB' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) - olcObjectClasses: ( 1.3.6.1.4.1.10176.1010.2.1 NAME 'univentionMail' DESC 'Univention Mail Preferences' SUP top AUXILIARY MUST uid MAY ( univentionMailHomeServer $ mailPrimaryAddress $ mailAlternativeAddress $ mailGlobalSpamFolder $ univentionMailUserQuota $ mailForwardAddress $ mailForwardCopyToSelf ) ) \ No newline at end of file diff --git a/charts/dbildungs-iam-ldap/templates/configmap-extraldif.yaml b/charts/dbildungs-iam-ldap/templates/configmap-extraldif.yaml index 27ab8de..ed96b70 100644 --- a/charts/dbildungs-iam-ldap/templates/configmap-extraldif.yaml +++ b/charts/dbildungs-iam-ldap/templates/configmap-extraldif.yaml @@ -52,9 +52,14 @@ data: modify.ldif: |- # Group members dn: cn=lehrer,dc=schule-sh,dc=de - add: uniquemember + cn: lehrer + objectclass: groupOfUniqueNames + objectclass: top + dn: cn=lehrer,dc=schule-sh,dc=de uniquemember: cn=ssuperadmin,ou=oeffentlicheSchulen,dc=schule-sh,dc=de dn: cn=schueler,dc=schule-sh,dc=de - add: uniquemember + cn: schueler + objectclass: groupOfUniqueNames + objectclass: top uniquemember: cn=mmusterschueler,ou=oeffentlicheSchulen,dc=schule-sh,dc=de \ No newline at end of file