From c0d3a361e362e83c52fe7d1e1707254b4da26271 Mon Sep 17 00:00:00 2001
From: Josue-T <josue@tille.ch>
Date: Thu, 7 May 2020 10:48:49 +0200
Subject: [PATCH] Update data/hooks/conf_regen/06-slapd

Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
---
 data/hooks/conf_regen/06-slapd | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/data/hooks/conf_regen/06-slapd b/data/hooks/conf_regen/06-slapd
index 6759cef1a..38d3adfc5 100755
--- a/data/hooks/conf_regen/06-slapd
+++ b/data/hooks/conf_regen/06-slapd
@@ -54,27 +54,18 @@ do_pre_regen() {
     echo "$backup_dir" > "$tmp_backup_dir_file"
   fi
 
-  # remove legacy configuration file
-  if [ -f /etc/ldap/slapd-yuno.conf ]; then
-    mkdir -p ${pending_dir}/etc/ldap
-    touch "${pending_dir}/etc/ldap/slapd-yuno.conf"
-  fi
-  if [ -f /etc/ldap/slapd.conf ]; then
-    mkdir -p ${pending_dir}/etc/ldap
-    touch "${pending_dir}/etc/ldap/slapd.conf"
-  fi
-  if [ -f /etc/ldap/schema/yunohost.schema ]; then
-    mkdir -p ${pending_dir}/etc/ldap/schema
-    touch "${pending_dir}/etc/ldap/schema/yunohost.schema"
-  fi
-
-  cd /usr/share/yunohost/templates/slapd
-
   # create needed directories
   ldap_dir="${pending_dir}/etc/ldap"
   schema_dir="${ldap_dir}/schema"
   mkdir -p "$ldap_dir" "$schema_dir"
 
+  # remove legacy configuration file
+  [ ! -f /etc/ldap/slapd-yuno.conf ] || touch "${ldap_dir}/slapd-yuno.conf"
+  [ ! -f /etc/ldap/slapd.conf ] || touch "${ldap_dir}/slapd.conf"
+  [ ! -f /etc/ldap/schema/yunohost.schema ] || touch "${schema_dir}/yunohost.schema"
+
+  cd /usr/share/yunohost/templates/slapd
+
   # copy configuration files
   cp -a ldap.conf slapd.ldif "$ldap_dir"
   cp -a sudo.ldif mailserver.ldif permission.ldif "$schema_dir"