From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 16 Dec 2015 13:37:19 +0000 (+0100)
Subject: make pdnsconfdist test POSIXLY_CORRECT and update pdns.conf-dist
X-Git-Tag: dnsdist-1.0.0-alpha1~50^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3049%2Fhead;p=thirdparty%2Fpdns.git

make pdnsconfdist test POSIXLY_CORRECT and update pdns.conf-dist
---

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index d1b7d2a2aa..2a94a305bc 100644
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -30,17 +30,22 @@
 # any-to-tcp=no
 
 #################################
-# api-key	REST API Static authentication key (required for API use)
+# api	Enable/disable the REST API
+#
+# api=no
+
+#################################
+# api-key	Static pre-shared authentication key for access to the REST API
 #
 # api-key=
 
 #################################
-# api-logfile	Filename of the log file for JSON parser
+# api-logfile	Location of the server logfile (used by the REST API)
 #
 # api-logfile=/var/log/pdns.log
 
 #################################
-# api-readonly	If the JSON API should disallow data modification
+# api-readonly	Disallow data modification through the REST API when set
 #
 # api-readonly=no
 
@@ -204,11 +209,6 @@
 #
 # 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
 #
diff --git a/regression-tests.nobackend/pdnsconfdist/.gitignore b/regression-tests.nobackend/pdnsconfdist/.gitignore
new file mode 100644
index 0000000000..298010b4e4
--- /dev/null
+++ b/regression-tests.nobackend/pdnsconfdist/.gitignore
@@ -0,0 +1 @@
+pdns.conf-dist.out
diff --git a/regression-tests.nobackend/pdnsconfdist/command b/regression-tests.nobackend/pdnsconfdist/command
index df122a5d1d..21965410e8 100755
--- a/regression-tests.nobackend/pdnsconfdist/command
+++ b/regression-tests.nobackend/pdnsconfdist/command
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
-diff -u ../pdns/pdns.conf-dist <($PDNS --config)
+$PDNS --config > pdnsconfdist/pdns.conf-dist.out
+diff -u ../pdns/pdns.conf-dist ./pdnsconfdist/pdns.conf-dist.out