diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 99a139951..9c63e128e 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -26,14 +26,12 @@ import sys from optparse import SUPPRESS_HELP -from ipaserver.install import bindinstance, httpinstance +from ipaserver.install import bindinstance from ipaserver.install import installutils -from ipaserver.install import service from ipapython import version from ipalib import api from ipaplatform.paths import paths from ipapython import ipautil -from ipapython import sysrestore from ipapython.config import IPAOptionParser from ipapython.ipa_log_manager import standard_logging_setup, root_logger @@ -147,13 +145,6 @@ def main(): dns_installer.install_check(True, api, False, options, hostname=api.env.host) dns_installer.install(True, False, options) - # Restart http instance to make sure that python-dns has the right resolver - # https://bugzilla.redhat.com/show_bug.cgi?id=800368 - fstore = sysrestore.FileStore(paths.SYSRESTORE) - http = httpinstance.HTTPInstance(fstore) - service.print_msg("Restarting the web server") - http.restart() - # execute ipactl to refresh services status ipautil.run(['ipactl', 'start', '--ignore-service-failures'], raiseonerr=False) diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py index 9b2dd162e..23fde1b78 100644 --- a/ipaserver/install/dns.py +++ b/ipaserver/install/dns.py @@ -322,6 +322,8 @@ def install(standalone, replica, options, api=api): print("") bind.create_instance() + print("Restarting the web server to pick up resolv.conf changes") + services.knownservices.httpd.restart(capture_output=True) # on dnssec master this must be installed last dnskeysyncd = dnskeysyncinstance.DNSKeySyncInstance(fstore) diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 2140cc52f..60d38dc88 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -868,10 +868,6 @@ def install(installer): no_dnssec_validation=options.no_dnssec_validation) bind.create_file_with_system_records() - # Restart httpd to pick up the new IPA configuration - service.print_msg("Restarting the web server") - http.restart() - # Set the admin user kerberos password ds.change_admin_password(admin_password) diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index c64f209c1..fb7188913 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -943,10 +943,6 @@ def install(installer): else: api.Command.dns_update_system_records() - # Restart httpd to pick up the new IPA configuration - service.print_msg("Restarting the web server") - http.restart() - # Call client install script service.print_msg("Configuring client side components") try: