From 58c875c4dca88a536ad8ec6faa4ef33908a733fc Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Wed, 20 Sep 2023 22:38:24 +0200 Subject: [PATCH] slapd: make compatiable with Debian 12 --- host_vars/aeron.binary.kitchen | 1 + host_vars/aveta.binary.kitchen | 1 + host_vars/bacon.binary.kitchen | 1 + roles/slapd/templates/slapd.conf.j2 | 8 ++++---- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/host_vars/aeron.binary.kitchen b/host_vars/aeron.binary.kitchen index 41f9fe7..d616250 100644 --- a/host_vars/aeron.binary.kitchen +++ b/host_vars/aeron.binary.kitchen @@ -3,4 +3,5 @@ radius_hostname: radius3.binary.kitchen slapd_hostname: ldap3.binary.kitchen +slapd_replica_id: 3 slapd_role: slave diff --git a/host_vars/aveta.binary.kitchen b/host_vars/aveta.binary.kitchen index ded3e7e..ec7fdfe 100644 --- a/host_vars/aveta.binary.kitchen +++ b/host_vars/aveta.binary.kitchen @@ -3,4 +3,5 @@ radius_hostname: radius2.binary.kitchen slapd_hostname: ldap2.binary.kitchen +slapd_replica_id: 2 slapd_role: slave diff --git a/host_vars/bacon.binary.kitchen b/host_vars/bacon.binary.kitchen index 8d3a05c..0d0d5e9 100644 --- a/host_vars/bacon.binary.kitchen +++ b/host_vars/bacon.binary.kitchen @@ -13,4 +13,5 @@ ntp_peers: radius_hostname: radius1.binary.kitchen slapd_hostname: ldap1.binary.kitchen +slapd_replica_id: 1 slapd_role: slave diff --git a/roles/slapd/templates/slapd.conf.j2 b/roles/slapd/templates/slapd.conf.j2 index 1a36530..cd1f141 100644 --- a/roles/slapd/templates/slapd.conf.j2 +++ b/roles/slapd/templates/slapd.conf.j2 @@ -30,7 +30,7 @@ loglevel sync # Load dynamic backend modules: modulepath /usr/lib/ldap -moduleload back_hdb.la +moduleload back_mdb.la {% if slapd_role == 'master' %} moduleload syncprov.la {% endif %} @@ -97,10 +97,10 @@ TLSVerifyClient never ####################################################################### -# BDB database definitions +# MDB database definitions ####################################################################### -database hdb +database mdb suffix "{{ ldap_base }}" # checkpoint 32 30 @@ -157,7 +157,7 @@ smbk5pwd-must-change 0 # Replication Consumer ####################################################################### -syncrepl rid=1 +syncrepl rid={{ slapd_replica_id }} provider="ldaps://ldapm.binary.kitchen" searchbase="{{ ldap_base }}" type=refreshAndPersist