Skip to content

Commit

Permalink
No longer update resolv.conf to point to our own DNS server, let user…
Browse files Browse the repository at this point in the history
…s specify the --dns=127.0.0.1 explicitly.
  • Loading branch information
adelton committed Jan 6, 2025
1 parent 000d36e commit 17ec094
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions ipa-server-configure-first
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,6 @@ if [ "$1" == upgrade ] ; then
echo "The /data volume was created using incompatible image." >&2
exit 2
fi
if [ -f /data/etc/resolv.conf.ipa ] \
&& ! cmp /etc/resolv.conf /data/etc/resolv.conf.ipa \
&& ! grep '^nameserver 127\.0\.0\.1$' /etc/resolv.conf ; then
perl -pe 's/^(nameserver).*/$1 127.0.0.1/' /data/etc/resolv.conf.ipa > /etc/resolv.conf
if ! grep -q "\b$HOSTNAME\b" /etc/hosts ; then
echo "127.0.0.2 $HOSTNAME" >> /etc/hosts
fi
echo "NOTE:" >&2
echo "Consider setting --dns=127.0.0.1 when using internal DNS server." >&2
echo "The mechanism which sets it now will be removed from images in April 2025." >&2
fi
# Removing kdcinfo.* which is likely to hold old IP address
rm -rf /var/lib/sss/pubconf/kdcinfo.*
if cmp /data/build-id /data-template/build-id ; then
Expand Down Expand Up @@ -240,7 +229,6 @@ else
if [ "$IPA_SERVER_IP" == no-update ] ; then
echo "FreeIPA server IP address update disabled, skipping update-self-ip-address."
elif systemctl is-active -q named named-pkcs11 || [ -n "$IPA_SERVER_IP" ] ; then
cp -f /etc/resolv.conf /data/etc/resolv.conf.ipa
if wait_for_dns 180; then
update_server_ip_address
else
Expand Down

0 comments on commit 17ec094

Please sign in to comment.