Required patches mbasti-0088, mbasti-0089-2
Patch attached
--
Martin^2 Basti
From f2b31bb820f6995d2b285f1f487afa4aca5139af Mon Sep 17 00:00:00 2001
From: Martin Basti mba...@redhat.com
Date: Wed, 2 Jul 2014 15:56:29 +0200
Subject: [PATCH] Split dns docstring
---
ipalib/plugins/dns.py | 94 +--
1 file changed, 47 insertions(+), 47 deletions(-)
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
index 97d8dc168101d7f8b94c111c13f1d701a465d4ee..e8e4e33a17c935f81c66cb029af6bfdfd0a5a8e1 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -48,23 +48,23 @@ from ipapython.dnsutil import DNSName
__doc__ = _(
Domain Name System (DNS)
-
+) + _(
Manage DNS zone and resource records.
-
+) + _(
SUPPORTED ZONE TYPES
* Master zone (dnszone-*), contains authoritative data.
* Forward zone (dnsforwardzone-*), forwards queries to configured forwarders
(a set of DNS servers).
-
+) + _(
USING STRUCTURED PER-TYPE OPTIONS
-
+) + _(
There are many structured DNS RR types where DNS data stored in LDAP server
is not just a scalar value, for example an IP address or a domain name, but
a data structure which may be often complex. A good example is a LOC record
[RFC1876] which consists of many mandatory and optional parts (degrees,
minutes, seconds of latitude and longitude, altitude or precision).
-
+) + _(
It may be difficult to manipulate such DNS records without making a mistake
and entering an invalid value. DNS module provides an abstraction over these
raw records and allows to manipulate each RR type with specific options. For
@@ -72,7 +72,7 @@ each supported RR type, DNS module provides a standard option to manipulate
a raw records with format --rrtype-rec, e.g. --mx-rec, and special options
for every part of the RR structure with format --rrtype-partname, e.g.
--mx-preference and --mx-exchanger.
-
+) + _(
When adding a record, either RR specific options or standard option for a raw
value can be used, they just should not be combined in one add operation. When
modifying an existing entry, new RR specific options can be used to change
@@ -81,41 +81,41 @@ to specify the modified value. The following example demonstrates
a modification of MX record preference from 0 to 1 in a record without
modifying the exchanger:
ipa dnsrecord-mod --mx-rec=0 mx.example.com. --mx-preference=1
-
+) + _(
EXAMPLES:
-
+) + _(
Add new zone:
ipa dnszone-add example.com --name-server=ns \\
--admin-email=ad...@example.com \\
--ip-address=192.0.2.1
-
+) + _(
Add system permission that can be used for per-zone privilege delegation:
ipa dnszone-add-permission example.com
-
+) + _(
Modify the zone to allow dynamic updates for hosts own records in realm EXAMPLE.COM:
ipa dnszone-mod example.com --dynamic-update=TRUE
-
+) + _(
This is the equivalent of:
ipa dnszone-mod example.com --dynamic-update=TRUE \\
--update-policy=grant EXAMPLE.COM krb5-self * A; grant EXAMPLE.COM krb5-self * ; grant EXAMPLE.COM krb5-self * SSHFP;
-
+) + _(
Modify the zone to allow zone transfers for local network only:
ipa dnszone-mod example.com --allow-transfer=192.0.2.0/24
-
+) + _(
Add new reverse zone specified by network IP address:
ipa dnszone-add --name-from-ip=192.0.2.0/24 \\
--name-server=ns.example.com.
-
+) + _(
Add second nameserver for example.com:
ipa dnsrecord-add example.com @ --ns-rec=nameserver2.example.com
-
+) + _(
Add a mail server for example.com:
ipa dnsrecord-add example.com @ --mx-rec=10 mail1
-
+) + _(
Add another record using MX record specific options:
ipa dnsrecord-add example.com @ --mx-preference=20 --mx-exchanger=mail2
-
+) + _(
Add another record using interactive mode (started when dnsrecord-add, dnsrecord-mod,
or dnsrecord-del are executed with no options):
ipa dnsrecord-add example.com @
@@ -128,28 +128,28 @@ EXAMPLES:
Record name: example.com
MX record: 10 mail1, 20 mail2, 30 mail3
NS record: nameserver.example.com., nameserver2.example.com.
-
+) + _(
Delete previously added nameserver from example.com:
ipa dnsrecord-del example.com @ --ns-rec=nameserver2.example.com.
-
+) + _(
Add LOC record for example.com:
ipa dnsrecord-add example.com @ --loc-rec=49 11 42.4 N 16 36 29.6 E 227.64m
-
+) + _(
Add new A record for www.example.com. Create a reverse record in appropriate
reverse zone as well. In this case a PTR record 2 pointing to www.example.com
will be created in zone 2.0.192.in-addr.arpa.
ipa dnsrecord-add example.com www --a-rec=192.0.2.2 --a-create-reverse
-
+) + _(
Add new PTR record for www.example.com
ipa dnsrecord-add 2.0.192.in-addr.arpa. 2 --ptr-rec=www.example.com.
-
+) + _(
Add new SRV records for LDAP servers. Three quarters of the requests
should go to fast.example.com, one quarter to slow.example.com. If neither
is