diff options
| -rwxr-xr-x | install/tools/ipa-dns-install | 7 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-install | 6 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 8 |
3 files changed, 13 insertions, 8 deletions
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index c9014371e..096020c5e 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -22,7 +22,7 @@ import traceback from ipaserver.plugins.ldap2 import ldap2 -from ipaserver.install import bindinstance, ntpinstance +from ipaserver.install import service, bindinstance, ntpinstance, httpinstance from ipaserver.install.installutils import * from ipaserver.install import installutils from ipapython import version @@ -223,6 +223,11 @@ def main(): zone_notif=options.zone_notif) bind.create_instance() + # Restart http instance to make sure acutil has the right resolver + # https://bugzilla.redhat.com/show_bug.cgi?id=800368 + http = httpinstance.HTTPInstance(fstore) + service.print_msg("Restarting the web server") + http.restart() print "==============================================================================" print "Setup complete" diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index e4e4a8d84..65f5229df 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -456,13 +456,13 @@ def main(): service.print_msg("Restarting the KDC") krb.restart() + if options.setup_dns: + install_bind(config, options) + # Restart httpd to pick up the new IPA configuration service.print_msg("Restarting the web server") http.restart() - if options.setup_dns: - install_bind(config, options) - # Call client install script try: args = ["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--domain", config.domain_name, "--server", config.host_name, "--realm", config.realm_name] diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index c379dd777..9c7388b40 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -1009,10 +1009,6 @@ def main(): service.print_msg("Restarting the KDC") krb.restart() - # Restart httpd to pick up the new IPA configuration - service.print_msg("Restarting the web server") - http.restart() - # Create a BIND instance bind = bindinstance.BindInstance(fstore, dm_password) bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders, @@ -1026,6 +1022,10 @@ def main(): else: bind.create_sample_bind_zone() + # 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) |