From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 1 Dec 2015 12:22:00 +0000 (+0100)
Subject: Update pdns.conf-dist
X-Git-Tag: dnsdist-1.0.0-alpha1~136^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d5aaac9219723c37f02a7353f181650ceb5c675;p=thirdparty%2Fpdns.git

Update pdns.conf-dist
---

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index 962b705bb4..d1b7d2a2aa 100644
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -29,6 +29,21 @@
 #
 # any-to-tcp=no
 
+#################################
+# api-key	REST API Static authentication key (required for API use)
+#
+# api-key=
+
+#################################
+# api-logfile	Filename of the log file for JSON parser
+#
+# api-logfile=/var/log/pdns.log
+
+#################################
+# api-readonly	If the JSON API should disallow data modification
+#
+# api-readonly=no
+
 #################################
 # cache-ttl	Seconds to store packets in the PacketCache
 #
@@ -145,49 +160,29 @@
 # distributor-threads=3
 
 #################################
-# do-ipv6-additional-processing	Do AAAA additional processing
-#
-# do-ipv6-additional-processing=yes
-
-#################################
-# edns-subnet-processing	If we should act on EDNS Subnet options
-#
-# edns-subnet-processing=no
-
-#################################
-# entropy-source	If set, read entropy from this file
-#
-# entropy-source=/dev/urandom
-
-#################################
-# experimental-api-key	REST API Static authentication key (required for API use)
-#
-# experimental-api-key=
-
-#################################
-# experimental-api-readonly	If the JSON API should disallow data modification
+# dname-processing	If we should support DNAME records
 #
-# experimental-api-readonly=no
+# dname-processing=no
 
 #################################
-# experimental-dname-processing	If we should support DNAME records
+# dnsupdate	Enable/Disable DNS update (RFC2136) support. Default is no.
 #
-# experimental-dname-processing=no
+# dnsupdate=no
 
 #################################
-# experimental-dnsupdate	Enable/Disable DNS update (RFC2136) support. Default is no.
+# do-ipv6-additional-processing	Do AAAA additional processing
 #
-# experimental-dnsupdate=no
+# do-ipv6-additional-processing=yes
 
 #################################
-# experimental-json-interface	If the webserver should serve JSON data
+# edns-subnet-processing	If we should act on EDNS Subnet options
 #
-# experimental-json-interface=no
+# edns-subnet-processing=no
 
 #################################
-# experimental-logfile	Filename of the log file for JSON parser
+# entropy-source	If set, read entropy from this file
 #
-# experimental-logfile=/var/log/pdns.log
+# entropy-source=/dev/urandom
 
 #################################
 # experimental-lua-policy-script	Lua script for the policy engine
@@ -209,6 +204,11 @@
 #
 # include-dir=
 
+#################################
+# json-interface	If the webserver should serve JSON data
+#
+# json-interface=no
+
 #################################
 # launch	Which backends to launch and order to query them in
 #