Skip to content

Commit

Permalink
Merge pull request PowerDNS#14384 from omoerbeek/rec-debian-lua
Browse files Browse the repository at this point in the history
rec: keep Lua config for now as existing configs might use it
  • Loading branch information
omoerbeek authored Jun 26, 2024
2 parents 16152c9 + 6b2d950 commit 2653fdc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -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~

7 changes: 7 additions & 0 deletions builder-support/debian/recursor/debian-buster/recursor.lua
Original file line number Diff line number Diff line change
@@ -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")

4 changes: 4 additions & 0 deletions builder-support/debian/recursor/debian-buster/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2653fdc

Please sign in to comment.