auth: remove redundant --no-config from commands

Both the flags --no-config and --config=default prevent the loading of
configuration files from disk when used independently as per
https://github.com/PowerDNS/pdns/blob/master/pdns/receiver.cc#L418-L419

This commit removes the anomaly from documentation and build files to avoid
confusion and make it consistent among all packages.

diff --git a/builder-support/debian/authoritative/debian-buster/rules b/builder-support/debian/authoritative/debian-buster/rules
index 91d7b98e488dcaa7a7e8bd153be0172114e2c3ba..304916cf0263a82d3e3c73ffa05fa20fe6c5b023 100755 (executable)
--- a/builder-support/debian/authoritative/debian-buster/rules
+++ b/builder-support/debian/authoritative/debian-buster/rules
@@ -55,7 +55,7 @@ override_dh_installinit:
 
 override_dh_install:
        dh_install
-       ./pdns/pdns_server --no-config --config=default | sed \
+       ./pdns/pdns_server --config=default | sed \
          -e 's!# module-dir=.*!!' \
          -e 's!# include-dir=.*!&\ninclude-dir=/etc/powerdns/pdns.d!' \
          -e 's!# launch=.*!&\nlaunch=!' \

diff --git a/builder-support/debian/authoritative/debian-jessie/rules b/builder-support/debian/authoritative/debian-jessie/rules
index 8aca8fae2724736681c1d01b7092ee396cb797ab..5cc5cbb7c92d5194476907e021c1e06bdf101d17 100755 (executable)
--- a/builder-support/debian/authoritative/debian-jessie/rules
+++ b/builder-support/debian/authoritative/debian-jessie/rules
@@ -52,7 +52,7 @@ override_dh_installinit:
 
 override_dh_install:
        dh_install
-       ./pdns/pdns_server --no-config --config=default | sed \
+       ./pdns/pdns_server --config=default | sed \
          -e 's!# module-dir=.*!!' \
          -e 's!# include-dir=.*!&\ninclude-dir=/etc/powerdns/pdns.d!' \
          -e 's!# launch=.*!&\nlaunch=!' \

diff --git a/builder-support/debian/authoritative/debian-stretch/rules b/builder-support/debian/authoritative/debian-stretch/rules
index a1d62ac1fa7160e111d5c1e2447ee82f0178fe4f..28e42be93b5e535fba3384df67adde3181c33e48 100755 (executable)
--- a/builder-support/debian/authoritative/debian-stretch/rules
+++ b/builder-support/debian/authoritative/debian-stretch/rules
@@ -51,7 +51,7 @@ override_dh_installinit:
 
 override_dh_install:
        dh_install
-       ./pdns/pdns_server --no-config --config=default | sed \
+       ./pdns/pdns_server --config=default | sed \
          -e 's!# module-dir=.*!!' \
          -e 's!# include-dir=.*!&\ninclude-dir=/etc/powerdns/pdns.d!' \
          -e 's!# launch=.*!&\nlaunch=!' \

diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules
index 43099f8cf36d98f6a4c2cc11b8bbd33287c58982..1680d6c86e77ea2f86a81cacf056b65273dbce95 100755 (executable)
--- a/builder-support/debian/recursor/debian-buster/rules
+++ b/builder-support/debian/recursor/debian-buster/rules
@@ -44,7 +44,7 @@ override_dh_auto_install:
        install -m 644 -t debian/pdns-recursor/usr/share/pdns-recursor/lua-config debian/lua-config/rootkeys.lua
        install -m 644 -t debian/pdns-recursor/etc/powerdns debian/recursor.lua
        rm -f debian/pdns-recursor/etc/powerdns/recursor.conf-dist
-       ./pdns_recursor --no-config --config=default | sed \
+       ./pdns_recursor --config=default | sed \
                -e 's!# config-dir=.*!config-dir=/etc/powerdns!' \
                -e 's!# include-dir=.*!&\ninclude-dir=/etc/powerdns/recursor.d!' \
                -e 's!# local-address=.*!local-address=127.0.0.1!' \

diff --git a/builder-support/debian/recursor/debian-jessie/rules b/builder-support/debian/recursor/debian-jessie/rules
index f3f30aa5fcf6e981b12cc138c213bca9b64d8498..9f8872b027a6d7e839f10af7ba5143af837fc765 100755 (executable)
--- a/builder-support/debian/recursor/debian-jessie/rules
+++ b/builder-support/debian/recursor/debian-jessie/rules
@@ -43,7 +43,7 @@ override_dh_auto_install:
        install -m 644 -t debian/pdns-recursor/usr/share/pdns-recursor/lua-config debian/lua-config/rootkeys.lua
        install -m 644 -t debian/pdns-recursor/etc/powerdns debian/recursor.lua
        rm -f debian/tmp/etc/powerdns/recursor.conf-dist
-       ./pdns_recursor --no-config --config=default | sed \
+       ./pdns_recursor --config=default | sed \
                -e 's!# config-dir=.*!config-dir=/etc/powerdns!' \
                -e 's!# include-dir=.*!&\ninclude-dir=/etc/powerdns/recursor.d!' \
                -e 's!# local-address=.*!local-address=127.0.0.1!' \

diff --git a/builder-support/debian/recursor/debian-stretch/rules b/builder-support/debian/recursor/debian-stretch/rules
index 43099f8cf36d98f6a4c2cc11b8bbd33287c58982..1680d6c86e77ea2f86a81cacf056b65273dbce95 100755 (executable)
--- a/builder-support/debian/recursor/debian-stretch/rules
+++ b/builder-support/debian/recursor/debian-stretch/rules
@@ -44,7 +44,7 @@ override_dh_auto_install:
        install -m 644 -t debian/pdns-recursor/usr/share/pdns-recursor/lua-config debian/lua-config/rootkeys.lua
        install -m 644 -t debian/pdns-recursor/etc/powerdns debian/recursor.lua
        rm -f debian/pdns-recursor/etc/powerdns/recursor.conf-dist
-       ./pdns_recursor --no-config --config=default | sed \
+       ./pdns_recursor --config=default | sed \
                -e 's!# config-dir=.*!config-dir=/etc/powerdns!' \
                -e 's!# include-dir=.*!&\ninclude-dir=/etc/powerdns/recursor.d!' \
                -e 's!# local-address=.*!local-address=127.0.0.1!' \

diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec
index 5a78572cf97fd97ebd1e209eb88c5aa1dccb0d44..33d9bf551a0a4b81c41ba9ca171d552d6640cd23 100644 (file)
--- a/builder-support/specs/pdns.spec
+++ b/builder-support/specs/pdns.spec
@@ -238,7 +238,7 @@ make install DESTDIR=%{buildroot}
 %{__install} -D -p %{SOURCE1} %{buildroot}%{_initrddir}/pdns
 %endif
 
-%{buildroot}/usr/sbin/pdns_server --no-config --config=default | sed \
+%{buildroot}/usr/sbin/pdns_server --config=default | sed \
   -e 's!# daemon=.*!daemon=no!' \
   -e 's!# guardian=.*!guardian=no!' \
   -e 's!# launch=.*!&\\nlaunch=!' \

diff --git a/docs/backends/generic-sql.rst b/docs/backends/generic-sql.rst
index 66d17725114d01339656b527f4d1925c0891e67f..b056d607ba92f301669f3f5be5e496b0ddbd1310 100644 (file)
--- a/docs/backends/generic-sql.rst
+++ b/docs/backends/generic-sql.rst
@@ -190,7 +190,7 @@ the C function 'snprintf' which implies that substitutions are performed
 on the basis of %-placeholders.
 
 To see the default queries for a backend, run
-``pdns_server --no-config --launch=BACKEND --config``.
+``pdns_server --launch=BACKEND --config=default``.
 
 Regular Queries
 ^^^^^^^^^^^^^^^

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index ff2dc1058f53dab449983d2784b1595f8974c111..e54d7569e70eb7c87d4ea712e201f84b8265a8f1 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1264,7 +1264,7 @@ endif
 endif
 
 pdns.conf-dist: pdns_server
-       $(AM_V_GEN)./pdns_server --no-config --config=default 2>/dev/null > $@
+       $(AM_V_GEN)./pdns_server --config=default 2>/dev/null > $@
 
 testrunner_SOURCES = \
        arguments.cc \

diff --git a/pdns/recursordist/docs/getting-started.rst b/pdns/recursordist/docs/getting-started.rst
index 7c3adb6d6752cdf10e74a4837830c926aceda596..5e00612c7c50f5e4d9cf4ac99501e17e75bf7ed7 100644 (file)
--- a/pdns/recursordist/docs/getting-started.rst
+++ b/pdns/recursordist/docs/getting-started.rst
@@ -34,7 +34,7 @@ Configuring the Recursor
 The configuration file is called ``recursor.conf`` and is located in the ``SYSCONFDIR`` defined at compile-time.
 This is usually ``/etc/powerdns``, ``/etc/pdns``, ``/etc/pdns-recursor``, ``/usr/local/etc`` or similar.
 
-Run ``pdns_recursor --no-config --config | grep config-dir`` to find this location on you installation.
+Run ``pdns_recursor --config=default | grep config-dir`` to find this location on you installation.
 
 The PowerDNS Recursor listens on the local loopback interface by default, this can be changed with the :ref:`setting-local-address` setting.