From cb41cac5f7077954ea259df925930f924efd0d41 Mon Sep 17 00:00:00 2001 From: Duncan McCracken Date: Thu, 18 Oct 2018 09:19:13 +1100 Subject: [PATCH] Bug Fix: LDAP Proxy Install Addressed Issue #113 --- LDAPProxy/LDAPProxyInstall.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LDAPProxy/LDAPProxyInstall.sh b/LDAPProxy/LDAPProxyInstall.sh index 8d4ec97..ff0ae72 100644 --- a/LDAPProxy/LDAPProxyInstall.sh +++ b/LDAPProxy/LDAPProxyInstall.sh @@ -64,7 +64,7 @@ if [ ! -d "/var/appliance/conf" ]; then fi # Configure slapd -if [ -d "/etc/ldap" ]; then +if [ -d "/etc/ldap" ] && [ "$(getent passwd openldap)" != "" ]; then rm -rf /etc/ldap/slapd.d/ >> $logFile cp ./resources/slapd.conf /etc/ldap/slapd.conf >> $logFile cp ./resources/slapd.conf /var/appliance/conf/slapd.conf >> $logFile @@ -76,7 +76,7 @@ if [ -d "/etc/ldap" ]; then cp /etc/ssl/private/ssl-cert-snakeoil.key /var/appliance/conf/appliance.private.key chown openldap /var/appliance/conf/appliance.private.key fi -if [ -d "/etc/openldap" ]; then +if [ -d "/etc/openldap" ] && [ "$(getent passwd ldap)" != "" ]; then rm -rf /etc/openldap/slapd.d/ >> $logFile cp ./resources/slapdyum.conf /etc/openldap/slapd.conf >> $logFile cp ./resources/slapdyum.conf /var/appliance/conf/slapd.conf >> $logFile