IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-26 00:41:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove global variable dns_forwarders from ipaserver.install.dns

Browse Source 
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Spacek 2015-11-10 16:53:10 +01:00 committed by Jan Cholasta
parent 45d9d4e8ae
commit 8f5f0d6edd
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ipaserver/install/dns.py
View File

@ -32,7 +32,6 @@ from ipaserver.install import odsexporterinstance
from ipaserver.install import opendnssecinstance
ip_addresses = []
dns_forwarders = []
reverse_zones = []
@ -100,7 +99,6 @@ def _disable_dnssec():
def install_check(standalone, replica, options, hostname):
global ip_addresses
global dns_forwarders
global reverse_zones
fstore = sysrestore.FileStore(paths.SYSRESTORE)
@ -232,25 +230,24 @@ def install_check(standalone, replica, options, hostname):
True, options.ip_addresses)
if options.no_forwarders:
dns_forwarders = ()
options.forwarders = []
elif options.forwarders or options.auto_forwarders:
if options.forwarders:
dns_forwarders = options.forwarders
else:
dns_forwarders = []
if not options.forwarders:
options.forwarders = []
if options.auto_forwarders:
dns_forwarders += resolver.get_default_resolver().nameservers
options.forwarders += resolver.get_default_resolver().nameservers
elif standalone or not replica:
dns_forwarders = read_dns_forwarders()
options.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):
if options.forwarders:
if (not bindinstance.check_forwarders(options.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", dns_forwarders)
root_logger.debug("will use DNS forwarders: %s\n", options.forwarders)
if not standalone:
search_reverse_zones = False
@ -273,7 +270,6 @@ def install_check(standalone, replica, options, hostname):
def install(standalone, replica, options, api=api):
global ip_addresses
global dns_forwarders
global reverse_zones
local_dnskeysyncd_dn = DN(('cn', 'DNSKeySync'), ('cn', api.env.host),
@ -292,7 +288,8 @@ def install(standalone, replica, options, api=api):
bind = bindinstance.BindInstance(fstore, ldapi=True, api=api,
autobind=AUTOBIND_ENABLED)
bind.setup(api.env.host, ip_addresses, api.env.realm, api.env.domain,
dns_forwarders, conf_ntp, reverse_zones, zonemgr=options.zonemgr,
options.forwarders, conf_ntp, reverse_zones,
zonemgr=options.zonemgr,
no_dnssec_validation=options.no_dnssec_validation,
ca_configured=options.setup_ca)

5
ipaserver/install/server/install.py
View File

@ -628,8 +628,8 @@ def install_check(installer):
if options.setup_dns:
print("BIND DNS server will be configured to serve IPA domain with:")
print("Forwarders: %s" % (
"No forwarders" if not dns.dns_forwarders
else ", ".join([str(ip) for ip in dns.dns_forwarders])
"No forwarders" if not options.forwarders
else ", ".join([str(ip) for ip in options.forwarders])
))
print("Reverse zone(s): %s" % (
"No reverse zone" if options.no_reverse or not dns.reverse_zones
@ -765,7 +765,6 @@ def install(installer):
options.dm_password = dm_password
options.admin_password = admin_password
options.host_name = host_name
options.forwarders = dns.dns_forwarders
options.reverse_zones = dns.reverse_zones
cache_vars = {n: getattr(options, n) for o, n in installer.knobs()}
write_cache(cache_vars)