Merge pull request #14374 from omoerbeek/rec-debian-tweaks

Rec followup to #14265: use correct file suffix for reloading and debian tweaks
PowerDNS · Jun 24, 2024 · a376dc3 · a376dc3
2 parents c7670e3 + 2d0b368
commit a376dc3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/builder-support/debian/recursor/debian-buster/pdns-recursor.maintscript 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
diff --git 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:

diff --git a/pdns/recursordist/rec_channel_rec.cc b/pdns/recursordist/rec_channel_rec.cc
@@ -2207,7 +2207,7 @@ RecursorControlChannel::Answer luaconfig(bool broadcast)
     bool dummy1{};
     bool dummy2{};
     pdns::rust::settings::rec::Recursorsettings settings;
-    auto yamlstat = pdns::settings::rec::tryReadYAML(configname + ".yml", false, dummy1, dummy2, settings, g_slog);
+    auto yamlstat = pdns::settings::rec::tryReadYAML(configname + g_yamlSettingsSuffix, false, dummy1, dummy2, settings, g_slog);
     if (yamlstat != pdns::settings::rec::YamlSettingsStatus::OK) {
       return {1, "Not reloading dynamic part of YAML configuration\n"};
     }