IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Create systemd-resolved configuration on update

Browse Source 
Create systemd-resolved drop-in and restart the service when the drop-in
config file is missing and /etc/resolv.conf points to stub resolver
config file.

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes 2020-09-22 16:35:06 +02:00
parent d12f1b4b39
commit 79b9982b86
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipaserver/install/bindinstance.py
View File

@ -770,7 +770,10 @@ class BindInstance(service.Service):
# self.step("restarting named", self.__start) # self.step("restarting named", self.__start)
self.step("configuring named to start on boot", self.switch_service) self.step("configuring named to start on boot", self.switch_service)
self.step("changing resolv.conf to point to ourselves", self.__setup_resolv_conf) self.step(
"changing resolv.conf to point to ourselves",
self.setup_resolv_conf
)
self.start_creation() self.start_creation()
def start_named(self): def start_named(self):
@ -1116,7 +1119,7 @@ class BindInstance(service.Service):
sysupgrade.set_upgrade_state('dns', 'server_config_to_ldap', True) sysupgrade.set_upgrade_state('dns', 'server_config_to_ldap', True)
def __setup_resolv_conf(self): def setup_resolv_conf(self):
searchdomains = [self.domain] searchdomains = [self.domain]
nameservers = [] nameservers = []
resolve1_enabled = dnsforwarders.detect_resolve1_resolv_conf() resolve1_enabled = dnsforwarders.detect_resolve1_resolv_conf()

8
ipaserver/install/server/upgrade.py
View File

@ -29,6 +29,7 @@ import ipalib.util
import ipalib.errors import ipalib.errors
from ipaclient.install import timeconf from ipaclient.install import timeconf
from ipaclient.install.client import sssd_enable_ifp from ipaclient.install.client import sssd_enable_ifp
from ipalib.install.dnsforwarders import detect_resolve1_resolv_conf
from ipaplatform import services from ipaplatform import services
from ipaplatform.tasks import tasks from ipaplatform.tasks import tasks
from ipapython import ipautil, version from ipapython import ipautil, version
@ -1446,6 +1447,13 @@ def upgrade_bind(fstore):
bind_old_states(bind) bind_old_states(bind)
bind_old_upgrade_states() bind_old_upgrade_states()
# only upgrade with drop-in is missing and /etc/resolv.conf is a link to
# resolve1's stub resolver config file.
has_resolved_ipa_conf = os.path.isfile(paths.SYSTEMD_RESOLVED_IPA_CONF)
if not has_resolved_ipa_conf and detect_resolve1_resolv_conf():
bind.setup_resolv_conf()
logger.info("Updated systemd-resolved configuration")
if bind.is_configured() and not bind.is_running(): if bind.is_configured() and not bind.is_running():
# some upgrade steps may require bind running # some upgrade steps may require bind running
bind_started = True bind_started = True