From 17376896a42fd99b732d312e248453fb9658f570 Mon Sep 17 00:00:00 2001 From: kload Date: Wed, 30 Sep 2015 14:16:43 -0400 Subject: [PATCH] [fix] hdb/mdb replacement in regen script --- data/hooks/conf_regen/06-slapd | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/data/hooks/conf_regen/06-slapd b/data/hooks/conf_regen/06-slapd index 24e76d98a..2ffe329ea 100644 --- a/data/hooks/conf_regen/06-slapd +++ b/data/hooks/conf_regen/06-slapd @@ -18,6 +18,10 @@ function safe_copy () { cd /usr/share/yunohost/templates/slapd +# Remove legacy configuration file +sudo yunohost service saferemove -s slapd \ + /etc/ldap/slapd-yuno.conf + safe_copy mailserver.schema /etc/ldap/schema/mailserver.schema safe_copy ldap.conf /etc/ldap/ldap.conf safe_copy slapd.default /etc/default/slapd @@ -25,9 +29,11 @@ safe_copy slapd.default /etc/default/slapd # Compatibility: change from HDB to MDB on Jessie version=$(sed 's/\..*//' /etc/debian_version) if [[ "$version" == '8' ]]; then - sudo sed -i "s/ hdb/ mdb/g" slapd.conf - sudo sed -i "s/back_hdb/back_mdb/g" slapd.conf - sudo sed -i "s/dbconfig set_/#dbconfig set_/g" slapd.conf + cat slapd.conf \ + | sed "s/hdb$/mdb/g" \ + | sed "s/back_hdb/back_mdb/g" \ + | sed "s/^dbconfig set_/#dbconfig set_/g" \ + | sudo tee slapd.conf fi safe_copy slapd.conf /etc/ldap/slapd.conf