From 8e8526de8f4cefe7b6aed467e6e5dc4b81796a12 Mon Sep 17 00:00:00 2001 From: Ryan Breen Date: Sun, 30 Aug 2015 12:01:49 -0400 Subject: [PATCH] Cleanup for guides/forwarding.html --- .../docs/guides/forwarding.html.markdown | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/website/source/docs/guides/forwarding.html.markdown b/website/source/docs/guides/forwarding.html.markdown index 809c4f68e9..dc0e18befc 100644 --- a/website/source/docs/guides/forwarding.html.markdown +++ b/website/source/docs/guides/forwarding.html.markdown @@ -13,20 +13,20 @@ requires elevated privileges. Instead of running Consul with an administrative or root account, it is possible to instead forward appropriate queries to Consul, running on an unprivileged port, from another DNS server. -In this guide, we will demonstrate forwarding from [BIND](https://www.isc.org/downloads/bind/), +In this guide, we will demonstrate forwarding from [BIND](https://www.isc.org/downloads/bind/) as well as [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html). For the sake of simplicity, BIND and Consul are running on the same machine in this example, but this is not required. -It is worth mentioning that, by default, consul does not resolve DNS -records outside the `.consul.` zone, unless the +It is worth mentioning that, by default, Consul does not resolve DNS +records outside the `.consul.` zone unless the [recursors](/docs/agent/options.html#recursors) configuration option -has been set. An example of how this changes consul's behavior is: -When a consul DNS reply includes a CNAME record pointing outside -`.consul.` the DNS reply includes only CNAME records. -Contrastingly, when `recursors` is set and the upstream resolver is -functioning correctly, consul will try to resolve CNAMEs and include -any A/PTR records for them in its DNS reply. +has been set. As an example of how this changes Consul's behavior, +suppose a Consul DNS reply includes a CNAME record pointing outside +the `.consul` TLD. The DNS reply will only include CNAME records by +default. By contrast, when `recursors` is set and the upstream resolver is +functioning correctly, Consul will try to resolve CNAMEs and include +any records (e.g. A, AAAA, PTR) for them in its DNS reply. ### BIND Setup @@ -71,14 +71,15 @@ zone "consul" IN { Here we assume Consul is running with default settings and is serving DNS on port 8600. -### Dnsmasq +### Dnsmasq Setup + +Dnsmasq is typically configured via files in the `/etc/dnsmasq.d` directory. To configure Consul, create the file `/etc/dnsmasq.d/10-consul` with the following contents: -Add the following to your config. Typically `/etc/dnsmasq.d/` is enabled which should allow creation of a file `/etc/dnsmasq.d/10-consul`: ```text server=/consul/127.0.0.1#8600 ``` -restart the dnsmasq process after making configuration changes. +Once that configuration is created, restart the dnsmasq service. ### Testing