From 6b2d9507dab4d64623bbca6fcd3bbd57ddebff8e Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 25 Jun 2024 16:31:48 +0200 Subject: [PATCH] rec: keep Lua config as existing configs might use it --- .../recursor/debian-buster/pdns-recursor.maintscript | 3 ++- builder-support/debian/recursor/debian-buster/recursor.lua | 7 +++++++ builder-support/debian/recursor/debian-buster/rules | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 builder-support/debian/recursor/debian-buster/recursor.lua diff --git a/builder-support/debian/recursor/debian-buster/pdns-recursor.maintscript b/builder-support/debian/recursor/debian-buster/pdns-recursor.maintscript index da8d7e4e696e..ce9c72d156ad 100644 --- a/builder-support/debian/recursor/debian-buster/pdns-recursor.maintscript +++ b/builder-support/debian/recursor/debian-buster/pdns-recursor.maintscript @@ -1,3 +1,4 @@ # must support Ubuntu focal, with dpkg 1.19.7 -rm_conffile /etc/powerdns/recursor.lua 5.1~ +# Enable the line below once we fully moved to YAML configuration +#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 new file mode 100644 index 000000000000..1d670a572e49 --- /dev/null +++ b/builder-support/debian/recursor/debian-buster/recursor.lua @@ -0,0 +1,7 @@ +-- 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 519d9ef6d9cd..eee8834436c0 100755 --- a/builder-support/debian/recursor/debian-buster/rules +++ b/builder-support/debian/recursor/debian-buster/rules @@ -32,8 +32,12 @@ override_dh_auto_configure: --enable-dnstap \ --enable-nod +# Stop installing the Lua config files once we fully moved to YAML configuration 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