Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pass FQDN to slapd -h if olcServerID was set before #585

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+31 −16
Open

pass FQDN to slapd -h if olcServerID was set before #585

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d09927
pass FQDN to slapd -h if olcServerID was set before
oschlueter Aug 26, 2021
42031f5
update /etc/hosts before launching slapd
oschlueter Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update /etc/hosts before launching slapd
@oschlueter
oschlueter committed Aug 26, 2021
commit 42031f591c560b3fcd42a3a54f2c037cea346108
23 changes: 12 additions & 11 deletions image/service/slapd/startup.sh
View file
Original file line number Diff line number Diff line change
@@ -49,6 +49,18 @@ if [ -z "$FQDN" ]; then
FQDN="$(/bin/hostname --fqdn)"
fi

# force OpenLDAP to listen on all interfaces
# We need to make sure that /etc/hosts continues to include the
# fully-qualified domain name and not just the specified hostname.
if [ "$FQDN" != "$HOSTNAME" ]; then
FQDN_PARAM="$FQDN"
else
FQDN_PARAM=""
fi
ETC_HOSTS=$(cat /etc/hosts | sed "/$HOSTNAME/d")
echo "0.0.0.0 $FQDN_PARAM $HOSTNAME" > /etc/hosts
echo "$ETC_HOSTS" >> /etc/hosts

log-helper info "openldap user and group adjustments"
LDAP_OPENLDAP_UID=${LDAP_OPENLDAP_UID:-911}
LDAP_OPENLDAP_GID=${LDAP_OPENLDAP_GID:-911}
@@ -580,16 +592,5 @@ fi
ln -sf ${CONTAINER_SERVICE_DIR}/slapd/assets/.ldaprc $HOME/.ldaprc
ln -sf ${CONTAINER_SERVICE_DIR}/slapd/assets/ldap.conf /etc/ldap/ldap.conf

# force OpenLDAP to listen on all interfaces
# We need to make sure that /etc/hosts continues to include the
# fully-qualified domain name and not just the specified hostname.
if [ "$FQDN" != "$HOSTNAME" ]; then
FQDN_PARAM="$FQDN"
else
FQDN_PARAM=""
fi
ETC_HOSTS=$(cat /etc/hosts | sed "/$HOSTNAME/d")
echo "0.0.0.0 $FQDN_PARAM $HOSTNAME" > /etc/hosts
echo "$ETC_HOSTS" >> /etc/hosts

exit 0