* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1776779ef4e4a070f91b65a7cdc81b15419511d0
@ 2026-11-19 15:55 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2026-11-19 15:55 UTC (permalink / raw)
To: ipfire-scm
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 1776779ef4e4a070f91b65a7cdc81b15419511d0 (commit)
via 047db221c5d04a1efce7971c194bcb174ac4b32d (commit)
from 71b39d14bfee67461d65dbf728de5895a08c0dae (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1776779ef4e4a070f91b65a7cdc81b15419511d0
Author: Antonio Quartulli <antonio@mandelbit.com>
Date: Fri Nov 13 14:42:43 2026 +0100
dns.cgi: Force a reload after every change
The workers only set up DNS-over-TLS forwarders at startup, so after
enabling TLS they sent plain DNS to port 853 until knot-resolver was
restarted. Changes to the server list didn't reload at all.
Fixes: #14781
Signed-off-by: Antonio Quartulli <antonio@mandelbit.com>
commit 047db221c5d04a1efce7971c194bcb174ac4b32d
Author: Antonio Quartulli <antonio@mandelbit.com>
Date: Fri Nov 13 14:42:42 2026 +0100
knot-resolver: Add force-reload
A reload doesn't restart the workers when config.yaml is unchanged, so
they keep what their Lua script set up at startup. force-reload (also
available through dnsctrl) replaces them with a rolling restart.
Signed-off-by: Antonio Quartulli <antonio@mandelbit.com>
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/dns.cgi | 7 ++++---
src/initscripts/system/knot-resolver | 9 ++++++++-
src/misc-progs/dnsctrl.c | 7 +++++++
3 files changed, 19 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 713b0a308..d0080f7b6 100644
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -105,9 +105,6 @@ if ($cgiparams{'GENERAL'} eq _('Save')) {
# Call function to handle unbound restart, etc.
&_handle_unbound_and_more()
}
-
- # Reload DNS
- &General::system_background("/usr/local/bin/dnsctrl", "reload");
}
###
@@ -823,6 +820,10 @@ END
# Private function to handle the restart of unbound and more.
sub _handle_unbound_and_more () {
+ # Reload DNS and restart the workers, as they only read the
+ # forwarders when they start
+ &General::system_background("/usr/local/bin/dnsctrl", "force-reload");
+
# Check if the IDS is running.
if(&IDS::ids_is_running()) {
# Re-generate the file which contains the DNS Server
diff --git a/src/initscripts/system/knot-resolver b/src/initscripts/system/knot-resolver
index 980a095f3..a27323b37 100644
--- a/src/initscripts/system/knot-resolver
+++ b/src/initscripts/system/knot-resolver
@@ -45,6 +45,13 @@ case "${1}" in
--config=/etc/knot-resolver/config.yaml reload
;;
+ force-reload)
+ # Replace the workers too, so that they re-run the Lua script
+ # (e.g. to register the DNS-over-TLS forwarders)
+ /usr/bin/kresctl \
+ --config=/etc/knot-resolver/config.yaml reload --force
+ ;;
+
restart)
${0} stop
sleep 1
@@ -56,7 +63,7 @@ case "${1}" in
;;
*)
- echo "Usage: ${0} {start|stop|reload|restart|status}"
+ echo "Usage: ${0} {start|stop|reload|force-reload|restart|status}"
exit 1
;;
esac
diff --git a/src/misc-progs/dnsctrl.c b/src/misc-progs/dnsctrl.c
index 84b0ae211..66007c8f7 100644
--- a/src/misc-progs/dnsctrl.c
+++ b/src/misc-progs/dnsctrl.c
@@ -28,6 +28,13 @@ int main(int argc, char** argv) {
return run("/etc/rc.d/init.d/knot-resolver", args);
+ } else if (strcmp(argv[1], "force-reload") == 0) {
+ char* args[] = {
+ "force-reload", NULL,
+ };
+
+ return run("/etc/rc.d/init.d/knot-resolver", args);
+
} else if (strcmp(argv[1], "sync-rpzs") == 0) {
char* args[] = {
NULL,
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-19 15:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-19 15:55 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1776779ef4e4a070f91b65a7cdc81b15419511d0 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox