diff options
author | Martin Basti <mbasti@redhat.com> | 2015-05-13 18:49:25 +0200 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2015-05-19 14:21:31 +0000 |
commit | ae9c3e2dce000ed185b28e2e6e85043ad8d001ed (patch) | |
tree | 118b9992fdf1bfa34fd96cdaeaaed65b4e73f8d3 /install/tools/ipa-dns-install | |
parent | 5a741b614f39a148d849877e743200de5a7302db (diff) | |
download | freeipa-ae9c3e2dce000ed185b28e2e6e85043ad8d001ed.tar.gz freeipa-ae9c3e2dce000ed185b28e2e6e85043ad8d001ed.tar.xz freeipa-ae9c3e2dce000ed185b28e2e6e85043ad8d001ed.zip |
DNS install: extract DNS installer into one module
This is required modification to be able move to new installers.
DNS subsystem will be installed by functions in this module in each of
ipa-server-install, ipa-dns-install, ipa-replica-install install
scripts.
https://fedorahosted.org/freeipa/ticket/4468
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'install/tools/ipa-dns-install')
-rwxr-xr-x | install/tools/ipa-dns-install | 133 |
1 files changed, 8 insertions, 125 deletions
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 4527447a7..fd9311657 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -21,18 +21,16 @@ from optparse import OptionGroup, SUPPRESS_HELP -from ipaserver.install import (service, bindinstance, ntpinstance, - httpinstance, dnskeysyncinstance, opendnssecinstance, odsexporterinstance) +from ipaserver.install import bindinstance, httpinstance from ipaserver.install.installutils import * from ipaserver.install import installutils from ipapython import version -from ipapython import ipautil, sysrestore -from ipapython.ipaldap import AUTOBIND_ENABLED -from ipalib import api, errors, util +from ipalib import api from ipaplatform.paths import paths from ipapython.config import IPAOptionParser from ipapython.ipa_log_manager import standard_logging_setup, root_logger -from ipapython.ipautil import DN + +from ipaserver.install import dns as dns_installer log_file_name = paths.IPASERVER_INSTALL_LOG @@ -96,48 +94,6 @@ def main(): installutils.check_server_configuration() - global fstore - fstore = sysrestore.FileStore(paths.SYSRESTORE) - - print "==============================================================================" - print "This program will setup DNS for the FreeIPA Server." - print "" - print "This includes:" - print " * Configure DNS (bind)" - print " * Configure SoftHSM (required by DNSSEC)" - print " * Configure ipa-dnskeysyncd (required by DNSSEC)" - if options.dnssec_master: - print " * Configure ipa-ods-exporter (required by DNSSEC key master)" - print " * Configure OpenDNSSEC (required by DNSSEC key master)" - print " * Generate DNSSEC master key (required by DNSSEC key master)" - print "" - print "NOTE: DNSSEC zone signing is not enabled by default" - print "" - if options.dnssec_master: - print "DNSSEC support is experimental!" - print "" - print "Plan carefully, current version doesn't allow you to move DNSSEC" - print "key master to different server and master cannot be uninstalled" - print "" - print "" - print "To accept the default shown in brackets, press the Enter key." - print "" - - if options.dnssec_master and not options.unattended and not ipautil.user_input( - "Do you want to setup this IPA server as DNSSEC key master?", - False): - sys.exit("Aborted") - - # Check bind packages are installed - if not (bindinstance.check_inst(options.unattended) and - dnskeysyncinstance.check_inst()): - sys.exit("Aborting installation.") - - if options.dnssec_master: - # check opendnssec packages are installed - if not opendnssecinstance.check_inst(): - sys.exit("Aborting installation") - # Initialize the ipalib api cfg = dict( in_server=True, @@ -146,93 +102,20 @@ def main(): api.bootstrap(**cfg) api.finalize() - - # create BIND and OpenDNSSec instances - - bind = bindinstance.BindInstance(fstore, ldapi=True, - autobind=AUTOBIND_ENABLED) - - ods = opendnssecinstance.OpenDNSSECInstance(fstore, ldapi=True, - autobind=AUTOBIND_ENABLED) - if options.dnssec_master: - ods.realm = api.env.realm - dnssec_masters = ods.get_masters() - # we can reinstall current server if it is dnssec master - if not api.env.host in dnssec_masters and dnssec_masters: - print "DNSSEC key master(s):", u','.join(dnssec_masters) - sys.exit("Only one DNSSEC key master is supported in current version.") - - ip_addresses = get_server_ip_address(api.env.host, fstore, - options.unattended, True, options.ip_addresses) - - if options.no_forwarders: - dns_forwarders = () - elif options.forwarders: - dns_forwarders = options.forwarders - else: - dns_forwarders = read_dns_forwarders() - - # test DNSSEC forwarders - if dns_forwarders: - if (not bindinstance.check_forwarders(dns_forwarders, root_logger) - and not options.no_dnssec_validation): - options.no_dnssec_validation = True - print "WARNING: DNSSEC validation will be disabled" - - root_logger.debug("will use dns_forwarders: %s\n", str(dns_forwarders)) - api.Backend.ldap2.connect(autobind=True) - reverse_zones = bindinstance.check_reverse_zones(ip_addresses, - options.reverse_zones, options, options.unattended, True) - - if reverse_zones: - print "Using reverse zone(s) %s" % ', '.join(reverse_zones) - - conf_ntp = ntpinstance.NTPInstance(fstore).is_enabled() - - if not options.unattended: - print "" - print "The following operations may take some minutes to complete." - print "Please wait until the prompt is returned." - print "" + options.setup_ca = False - bind.setup(api.env.host, ip_addresses, api.env.realm, api.env.domain, - dns_forwarders, conf_ntp, reverse_zones, zonemgr=options.zonemgr, - no_dnssec_validation=options.no_dnssec_validation) - bind.create_instance() - - # on dnssec master this must be installed last - dnskeysyncd = dnskeysyncinstance.DNSKeySyncInstance(fstore, ldapi=True) - dnskeysyncd.create_instance(api.env.host, api.env.realm) - if options.dnssec_master: - ods_exporter = odsexporterinstance.ODSExporterInstance( - fstore, ldapi=True, autobind=AUTOBIND_ENABLED) - - ods_exporter.create_instance(api.env.host, api.env.realm) - ods.create_instance(api.env.host, api.env.realm) - - dnskeysyncd.start_dnskeysyncd() - bind.start_named() + dns_installer.install_check(True, 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() - print "==============================================================================" - print "Setup complete" - print "" - bind.check_global_configuration() - print "" - print "" - print "\tYou must make sure these network ports are open:" - print "\t\tTCP Ports:" - print "\t\t * 53: bind" - print "\t\tUDP Ports:" - print "\t\t * 53: bind" - return 0 if __name__ == '__main__': |