rec: tweak debian install, as suggested by @zeha

diff --git a/builder-support/debian/recursor/debian-buster/pdns-recursor.maintscript b/builder-support/debian/recursor/debian-buster/pdns-recursor.maintscript
new file mode 100644 (file)
index 0000000..da8d7e4
--- /dev/null
+++ b/builder-support/debian/recursor/debian-buster/pdns-recursor.maintscript
@@ -0,0 +1,3 @@
+# must support Ubuntu focal, with dpkg 1.19.7
+rm_conffile /etc/powerdns/recursor.lua 5.1~
+

diff --git a/builder-support/debian/recursor/debian-buster/recursor.lua b/builder-support/debian/recursor/debian-buster/recursor.lua
deleted file mode 100644 (file)
index 1d670a5..0000000
--- a/builder-support/debian/recursor/debian-buster/recursor.lua
+++ /dev/null
@@ -1,7 +0,0 @@
--- Debian default Lua configuration file for PowerDNS Recursor
-
--- Load DNSSEC root keys from dns-root-data package.
--- Note: If you provide your own Lua configuration file, consider
--- running rootkeys.lua too.
-dofile("/usr/share/pdns-recursor/lua-config/rootkeys.lua")
-

diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules
index 2806c456a8ad0e30cddd192c729f0f7ba1b9e564..519d9ef6d9cdf0c3fcd54afd70eb39ead9bc44fb 100755 (executable)
--- a/builder-support/debian/recursor/debian-buster/rules
+++ b/builder-support/debian/recursor/debian-buster/rules
@@ -34,26 +34,23 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
        dh_auto_install
-       install -d debian/pdns-recursor/usr/share/pdns-recursor/lua-config
-       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
        install -d debian/pdns-recursor/usr/share/pdns-recursor/snmp
        install -m 644 -t debian/pdns-recursor/usr/share/pdns-recursor/snmp RECURSOR-MIB.txt
        rm -f debian/pdns-recursor/etc/powerdns/recursor.conf-dist
        rm -f debian/pdns-recursor/etc/powerdns/recursor.yml-dist
        @echo "\
        dnssec:\n\
-         # validation: process\n\
+         # validation: process # default\n\
+         trustanchorfile: /usr/share/dns/root.key\n\
        recursor:\n\
          hint_file: /usr/share/dns/root.hints\n\
          include_dir: /etc/powerdns/recursor.d\n\
-         lua_config_file: /etc/powerdns/recursor.lua\n\
        incoming:\n\
         # listen:\n\
-        # - 127.0.0.1\n\
+        # - 127.0.0.1 # default\n\
        outgoing:\n\
         # source_address:\n\
-        # - 0.0.0.0\n\
+        # - 0.0.0.0 # default\n\
        " > debian/pdns-recursor/etc/powerdns/recursor.conf
 
 override_dh_auto_test: