diff --git a/lib/functions.sh b/lib/functions.sh index 0da2244..70fe0f9 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -1498,7 +1498,7 @@ get_installedapps() { } get_appvars() { BUNDLE=$(egrep "TIER|BUNDLE" /etc/federated | awk -F\" '{ print $2 }') - LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret` + [[ -d "/federated/apps/ldap" ]] && LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret` EXTERNALIP=$(get_externalip) MYSQL_ROOTPASSWORD=`cat /federated/apps/pdnsmysql/.env | grep MYSQL_ROOT_PASSWORD | awk -F= '{ print $2 }'` @@ -1537,7 +1537,7 @@ get_appvars() { fi # Get LDAP DOMAIN from ldap its self and setup variables for each part - LDAP_DOMAIN=$(docker exec ldap slapcat | grep "dn:" | head -1 | awk -F: '{ print $2 }') + [[ -d "/federated/apps/ldap" ]] && LDAP_DOMAIN=$(docker exec ldap slapcat | grep "dn:" | head -1 | awk -F: '{ print $2 }') # Setup LDAP_DOMAIN variable for domain or subdomain LDAP_DOMAIN_ARRAY=(${LDAP_DOMAIN//,/ }) @@ -1551,12 +1551,14 @@ get_appvars() { fi # Set SMTP user based on if fcore or admin exists - if [[ $(docker exec ldap slapcat | grep fcore) ]]; then - SMTPUSER="fcore" - elif [[ $(docker exec ldap slapcat | grep admin) ]]; then - SMTPUSER="admin" - else - SMTPUSER="fcore" + if [[ -d "/federated/apps/ldap" ]]; then + if [[ $(docker exec ldap slapcat | grep fcore) ]]; then + SMTPUSER="fcore" + elif [[ $(docker exec ldap slapcat | grep admin) ]]; then + SMTPUSER="admin" + else + SMTPUSER="fcore" + fi fi } get_appvars_old() {