diff options
Diffstat (limited to 'install')
| -rw-r--r-- | install/share/bind.named.conf.template | 2 | ||||
| -rwxr-xr-x | install/tools/ipa-dns-install | 3 | ||||
| -rw-r--r-- | install/tools/man/ipa-dns-install.1 | 3 | ||||
| -rw-r--r-- | install/tools/man/ipa-replica-install.1 | 3 | ||||
| -rw-r--r-- | install/tools/man/ipa-server-install.1 | 3 |
5 files changed, 13 insertions, 1 deletions
diff --git a/install/share/bind.named.conf.template b/install/share/bind.named.conf.template index 3c19383c0..eb6d4ae27 100644 --- a/install/share/bind.named.conf.template +++ b/install/share/bind.named.conf.template @@ -8,7 +8,7 @@ options { statistics-file "data/named_stats.txt"; memstatistics-file "data/named_mem_stats.txt"; - forward first; + forward $FORWARD_POLICY; forwarders {$FORWARDERS}; // Any host is permitted to issue recursive queries diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 2eb1d0258..53afd714d 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -57,6 +57,9 @@ def parse_options(): parser.add_option("--auto-forwarders", dest="auto_forwarders", action="store_true", default=False, help="Use DNS forwarders configured in /etc/resolv.conf") + parser.add_option("--forward-policy", dest="forward_policy", + choices=("first", "only"), default="first", + help="DNS forwarding policy for global forwarders") parser.add_option("--reverse-zone", dest="reverse_zones", default=[], action="append", metavar="REVERSE_ZONE", help="The reverse DNS zone to use. This option can be used multiple times") diff --git a/install/tools/man/ipa-dns-install.1 b/install/tools/man/ipa-dns-install.1 index a997eb841..e3739e2bb 100644 --- a/install/tools/man/ipa-dns-install.1 +++ b/install/tools/man/ipa-dns-install.1 @@ -41,6 +41,9 @@ Do not add any DNS forwarders, send non\-resolvable addresses to the DNS root se \fB\-\-auto\-forwarders\fR Add DNS forwarders configured in /etc/resolv.conf to the list of forwarders used by IPA DNS. .TP +\fB\-\-forward\-policy\fR=\fIfirst|only\fR +DNS forwarding policy for global forwarders specified using other options. Defaults to first. +.TP \fB\-\-reverse\-zone\fR=\fIREVERSE_ZONE\fR The reverse DNS zone to use. This option can be used multiple times to specify multiple reverse zones. .TP diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1 index 68976e7f9..6875f4e41 100644 --- a/install/tools/man/ipa-replica-install.1 +++ b/install/tools/man/ipa-replica-install.1 @@ -149,6 +149,9 @@ Do not add any DNS forwarders. Root DNS servers will be used instead. \fB\-\-auto\-forwarders\fR Add DNS forwarders configured in /etc/resolv.conf to the list of forwarders used by IPA DNS. .TP +\fB\-\-forward\-policy\fR=\fIfirst|only\fR +DNS forwarding policy for global forwarders specified using other options. Defaults to first. +.TP \fB\-\-reverse\-zone\fR=\fIREVERSE_ZONE\fR The reverse DNS zone to use. This option can be used multiple times to specify multiple reverse zones. .TP diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1 index 242b41b77..e5f6f760b 100644 --- a/install/tools/man/ipa-server-install.1 +++ b/install/tools/man/ipa-server-install.1 @@ -158,6 +158,9 @@ Do not add any DNS forwarders. Root DNS servers will be used instead. \fB\-\-auto\-forwarders\fR Add DNS forwarders configured in /etc/resolv.conf to the list of forwarders used by IPA DNS. .TP +\fB\-\-forward\-policy\fR=\fIfirst|only\fR +DNS forwarding policy for global forwarders specified using other options. Defaults to first. +.TP \fB\-\-reverse\-zone\fR=\fIREVERSE_ZONE\fR The reverse DNS zone to use. This option can be used multiple times to specify multiple reverse zones. .TP |