diff options
author | Jan Cholasta <jcholast@redhat.com> | 2011-07-26 14:53:19 +0200 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2011-08-09 13:12:19 +0200 |
commit | 8edd7ed99874f114ec6ca6abbbdd4b91025211df (patch) | |
tree | bbdfcea75de3b54478fbcc01b25fc5fb78a908fa /install/tools/ipa-server-install | |
parent | bc6e12842640099aaf97200e856075b9440eae28 (diff) | |
download | freeipa-8edd7ed99874f114ec6ca6abbbdd4b91025211df.tar.gz freeipa-8edd7ed99874f114ec6ca6abbbdd4b91025211df.tar.xz freeipa-8edd7ed99874f114ec6ca6abbbdd4b91025211df.zip |
Ask for reverse DNS zone information in attended install right after asking for DNS forwarders, so that DNS configuration is done in one place.
ticket 1522
Diffstat (limited to 'install/tools/ipa-server-install')
-rwxr-xr-x | install/tools/ipa-server-install | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 98941efe0..3605b0393 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -711,6 +711,16 @@ def main(): dns_forwarders = options.forwarders else: dns_forwarders = read_dns_forwarders() + + if options.reverse_zone: + reverse_zone = bindinstance.normalize_zone(options.reverse_zone) + elif not options.no_reverse: + reverse_zone = bindinstance.get_reverse_zone_default(ip) + if not options.unattended and bindinstance.create_reverse(): + reverse_zone = bindinstance.read_reverse_zone(reverse_zone, ip) + + if reverse_zone is not None: + print "Using reverse zone %s" % reverse_zone else: dns_forwarders = () logging.debug("will use dns_forwarders: %s\n" % str(dns_forwarders)) @@ -919,17 +929,6 @@ def main(): # Create a BIND instance bind = bindinstance.BindInstance(fstore, dm_password) - if options.setup_dns: - if options.reverse_zone: - reverse_zone = bindinstance.normalize_zone(options.reverse_zone) - elif not options.no_reverse: - reverse_zone = bindinstance.get_reverse_zone_default(ip) - if not options.unattended and bindinstance.create_reverse(): - reverse_zone = bindinstance.read_reverse_zone(reverse_zone, ip) - - if reverse_zone is not None: - print "Using reverse zone %s" % reverse_zone - bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders, options.conf_ntp, reverse_zone, zonemgr=options.zonemgr) if options.setup_dns: api.Backend.ldap2.connect(bind_dn="cn=Directory Manager", bind_pw=dm_password) |