From 598cb11a98de95c8bf1c4f0e98e5c1ff05a37f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Sat, 21 May 2016 16:45:09 +0200 Subject: [PATCH] [fix] Rely on conf file for current backend and create slapd.d --- data/hooks/conf_regen/06-slapd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/hooks/conf_regen/06-slapd b/data/hooks/conf_regen/06-slapd index e6a835cb0..cc861a470 100755 --- a/data/hooks/conf_regen/06-slapd +++ b/data/hooks/conf_regen/06-slapd @@ -46,8 +46,7 @@ do_pre_regen() { sudo rm -f "$tmp_backup_dir_file" # retrieve current and new backends - curr_backend=$(sudo slapcat -n 0 \ - | sed -n 's/^dn: olcDatabase={1}\(.*\),cn=config$/\1/p') + curr_backend=$(grep '^database' /etc/ldap/slapd.conf | awk '{print $2}') new_backend=$(grep '^database' slapd.conf | awk '{print $2}') # save current database before any conf changes @@ -69,6 +68,9 @@ do_pre_regen() { do_post_regen() { regen_conf_files=$1 + # ensure that slapd.d exists + sudo mkdir -p /etc/ldap/slapd.d + # fix some permissions sudo chown root:openldap /etc/ldap/slapd.conf sudo chown -R openldap:openldap /etc/ldap/schema/