From bde1d82ebe32be339c30c85048fd18e1ce99867d Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka Date: Tue, 8 Nov 2016 13:05:51 +0100 Subject: Move httpd restart to DNS installation Web service needs restarting after bindinstance is created to pick up changes done to /etc/resolv.conf. This change should be included anytime DNS is installed therefore it makes sense to move it to the common code. https://fedorahosted.org/freeipa/ticket/6392 Reviewed-By: Martin Basti Reviewed-By: Jan Cholasta --- ipaserver/install/dns.py | 2 ++ ipaserver/install/server/install.py | 4 ---- ipaserver/install/server/replicainstall.py | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) (limited to 'ipaserver/install') 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: -- cgit