Adding upstream version 20210907.upstream/20210907

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 11 insertions, 6 deletions

diff --git a/knot/bin/knot-zone-reset b/knot/bin/knot-reset-zones
index cc310b0..aae5ec1 100755
--- a/knot/bin/knot-zone-reset
+++ b/knot/bin/knot-reset-zones
@@ -33,9 +33,10 @@ for HOST in ${HOSTS}
 do
 	case "${HOST}" in
 		localhost)
-			echo -n "Flushing zone memory..."
+			echo -n "Resetting in-memory data for all zones..."
 
 			service knot stop
+			rm -rf /var/lib/knot/journal/*.mdb
 			rm -rf /var/lib/knot/timers/*.mdb
 			service knot start
 
@@ -43,9 +44,13 @@ do
 			;;
 
 		*)
-			echo -n "Flushing ${HOST} zone memory..."
+			echo -n "'${HOST}': Resetting in-memory data for all zones..."
 
-			ssh "${HOST}" "sudo service knot stop && rm -rf /var/lib/knot/timers/*.mdb && sudo service knot start"
+			ssh "${HOST}" \
+				"sudo service knot stop && \
+				rm -rf /var/lib/knot/journal/*.mdb && \
+				rm -rf /var/lib/knot/timers/*.mdb && \
+				sudo service knot start"
 
 			echo " done."
 			;;
diff --git a/knot/share/cron/knot-reset-zones b/knot/share/cron/knot-reset-zones
new file mode 100755
index 0000000..9762da4
--- /dev/null
+++ b/knot/share/cron/knot-reset-zones
@@ -0,0 +1,3 @@
+# /etc/cron.d/knot-reset-zone
+
+0 0 * * *	root	/usr/bin/knot-reset-zones localhost > /dev/null 2>&1
diff --git a/knot/share/cron/knot-zone-reset b/knot/share/cron/knot-zone-reset
deleted file mode 100755
index b6ec7a7..0000000
--- a/knot/share/cron/knot-zone-reset
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/cron.d/knot-reset-zone
-
-0 0 * * *	root	/usr/bin/knot-reset-zone localhost > /dev/null 2>&1