builder: use new --config=default for building config templates

diff --git a/builder-support/debian/authoritative/debian-buster/rules b/builder-support/debian/authoritative/debian-buster/rules
index fd44e419422ee8936dc50f26177175164f0406f7..91d7b98e488dcaa7a7e8bd153be0172114e2c3ba 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 | sed \
+       ./pdns/pdns_server --no-config --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 95a38b4d1653d57c1492b7074470582b5387ea51..8aca8fae2724736681c1d01b7092ee396cb797ab 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 | sed \
+       ./pdns/pdns_server --no-config --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 20c8df6e6a617b2ef7f94918cf376c342c77b203..a1d62ac1fa7160e111d5c1e2447ee82f0178fe4f 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 | sed \
+       ./pdns/pdns_server --no-config --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 2956517fe73a1000924df3f5f3ddae56b519febe..6f44c616cb3e15c42a08bbfdf4a15c2cce365d4c 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 | sed \
+       ./pdns_recursor --no-config --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 63ce9f2b5f27cde172ab55bda2cfc7ffa56f5fd9..826e7620d396fa29424b8bf359d0bb85cae120ed 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 | sed \
+       ./pdns_recursor --no-config --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 2956517fe73a1000924df3f5f3ddae56b519febe..6f44c616cb3e15c42a08bbfdf4a15c2cce365d4c 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 | sed \
+       ./pdns_recursor --no-config --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 38aaff286ae2bc6d0e70ca4734b0ce5f972e55ba..92150ef77484bb1b37df96903c4f2662977e7f8c 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 | sed \
+%{buildroot}/usr/sbin/pdns_server --no-config --config=default | sed \
   -e 's!# daemon=.*!daemon=no!' \
   -e 's!# guardian=.*!guardian=no!' \
   -e 's!# launch=.*!&\\nlaunch=!' \