From e28c618e677d491b99fc1e00d2fe9e09d4f99e53 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 27 May 2020 21:54:07 +0200 Subject: [PATCH] Those single quotes were probably meant to be double quotes? --- data/hooks/conf_regen/06-slapd | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/data/hooks/conf_regen/06-slapd b/data/hooks/conf_regen/06-slapd index 8d79335a2..9f808b58e 100755 --- a/data/hooks/conf_regen/06-slapd +++ b/data/hooks/conf_regen/06-slapd @@ -101,18 +101,16 @@ do_post_regen() { [ -z "$regen_conf_files" ] && exit 0 - # check if a backup should be restored - backup_dir=$(cat "$tmp_backup_dir_file" 2>/dev/null || true) - # regenerate LDAP config directory from slapd.conf echo "Regenerate LDAP config directory from slapd.ldif" _regenerate_slapd_conf + # If there's a backup, re-import its data + backup_dir=$(cat "$tmp_backup_dir_file" 2>/dev/null || true) if [[ -n "$backup_dir" && -f "${backup_dir}/dc=yunohost-dc=org.ldif" ]]; then # regenerate LDAP config directory and import database as root echo "Import the database using slapadd" - slapadd -F /etc/ldap/slapd.d -b dc=yunohost,dc=org \ - -l '${backup_dir}/dc=yunohost-dc=org.ldif' + slapadd -F /etc/ldap/slapd.d -b dc=yunohost,dc=org -l "${backup_dir}/dc=yunohost-dc=org.ldif" chown -R openldap:openldap /var/lib/ldap 2>&1 fi