make pdnsconfdist test POSIXLY_CORRECT and update pdns.conf-dist

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index d1b7d2a2aaf3e53156a4d20525ea1ec0c1bdb2af..2a94a305bcd119d4f2cfe225ba555e39cd80542d 100644 (file)
--- 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 (file)
index 0000000..298010b
--- /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 df122a5d1d9f42747a0e5aad6d6cd57882a4b0f4..21965410e8c670cebd9a00dc923cd27e6f4d1e58 100755 (executable)
--- 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