This patch fixes reverse DNS zone creation so that a /24 IPv4 and /64
IPv6 reverse zones are created by default. The reverse zone can be
customized using new --reverse-zone option in ipa-server-install,
ipa-replica-prepare, ipa-replica-install and ipa-dns-install, which
replaces the old way of using the netmask part of the --ip-address
option. The reverse zone name is printed to the user during the install.
https://fedorahosted.org/freeipa/ticket/1398
Honza
--
Jan Cholasta
>From 0c0a797c09102e5c9abd36629a2f66d7121e5a2f Mon Sep 17 00:00:00 2001
From: Jan Cholasta
Date: Mon, 11 Jul 2011 10:14:53 +0200
Subject: [PATCH] Fix creation of reverse DNS zones.
Create reverse DNS zone for /24 IPv4 subnet and /64 IPv6 subnet by
default instead of using the netmask from the --ip-address option.
Custom reverse DNS zone can be specified using new --reverse-zone
option, which replaces the old --ip-address netmask way of creating
reverse zones.
The reverse DNS zone name is printed to the user during the install.
ticket 1398
---
install/tools/ipa-dns-install | 50 +++-
install/tools/ipa-replica-install | 40 ++
install/tools/ipa-replica-prepare | 53 +++--
install/tools/ipa-server-install| 36 +
install/tools/man/ipa-dns-install.1 |3 +
install/tools/man/ipa-replica-install.1 |3 +
install/tools/man/ipa-replica-prepare.1 |6 ++
install/tools/man/ipa-server-install.1 |3 +
ipaserver/install/bindinstance.py | 126 +++
9 files changed, 196 insertions(+), 124 deletions(-)
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install
index b5295b5..eb1336e 100755
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -38,14 +38,14 @@ def parse_options():
parser.add_option("-d", "--debug", dest="debug", action="store_true",
default=False, help="print debugging information")
parser.add_option("--ip-address", dest="ip_address",
- type="ip", ip_netmask=True, ip_local=True, help="Master Server IP Address")
+ type="ip", ip_local=True, help="Master Server IP Address")
parser.add_option("--forwarder", dest="forwarders", action="append",
type="ip", help="Add a DNS forwarder")
parser.add_option("--no-forwarders", dest="no_forwarders", action="store_true",
default=False, help="Do not add any DNS forwarders, use root servers instead")
-parser.add_option("--no-reverse", dest="no_reverse",
- action="store_true", default=False,
- help="Do not create reverse DNS zone")
+parser.add_option("--reverse-zone", dest="reverse_zone", help="The reverse DNS zone to use")
+parser.add_option("--no-reverse", dest="no_reverse", action="store_true",
+ default=False, help="Do not create reverse DNS zone")
parser.add_option("--zonemgr", dest="zonemgr",
help="DNS zone manager e-mail address. Defaults to root")
parser.add_option("-U", "--unattended", dest="unattended", action="store_true",
@@ -56,6 +56,8 @@ def parse_options():
if options.forwarders and options.no_forwarders:
parser.error("You cannot specify a --forwarder option together with --no-forwarders")
+elif options.reverse_zone and options.no_reverse:
+parser.error("You cannot specify a --reverse-zone option together with --no-reverse")
if options.unattended:
if not options.forwarders and not options.no_forwarders:
@@ -104,26 +106,28 @@ def main():
# Check we have a public IP that is associated with the hostname
if options.ip_address:
-ip_address = options.ip_address
+ip = options.ip_address
else:
hostaddr = resolve_host(api.env.host)
-ip_address = hostaddr and ipautil.CheckedIPAddress(hostaddr)
+ip = hostaddr and ipautil.CheckedIPAddress(hostaddr)
try:
-verify_ip_address(ip_address)
+verify_ip_address(ip)
except Exception, e:
-print "Error: Invalid IP Address %s: %s" % (ip_address, e)
-ip_address = None
+print "Error: Invalid IP Address %s: %s" % (ip, e)
+ip = None
-if not ip_address:
+if not ip:
if options.unattended:
sys.exit("Unable to resolve IP address for host name")
else:
-ip_address = read_ip_address(api.env.host, fstore)
-ip_prefixlen = ip_address.prefixlen
-ip_address = str(ip_address)
+ip = read_ip_address(api.env.host, fstore)
+ip_address = str(ip)
logging.debug("will use ip_address: %s\n", ip_address)
+if options.reverse_zone and not bindinstance.verify_reverse_zone(options.reverse_zone, ip):
+sys.exit(1)
+
if options.no_forwarders:
dns_forwarders = ()
elif options.forwarders:
@@ -161,13 +165,6 @@ def main():
