bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Added check if ldap exists

Browse Source
This commit is contained in:
root 2025-01-22 21:17:17 +00:00
parent 8cdfcd98e5
commit 689fb6b128
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/functions.sh
View File

@ -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,6 +1551,7 @@ get_appvars() {
fi
# Set SMTP user based on if fcore or admin exists
if [[ -d "/federated/apps/ldap" ]]; then
if [[ $(docker exec ldap slapcat | grep fcore) ]]; then
SMTPUSER="fcore"
elif [[ $(docker exec ldap slapcat | grep admin) ]]; then
@ -1558,6 +1559,7 @@ get_appvars() {
else
SMTPUSER="fcore"
fi
fi
}
get_appvars_old() {
LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`