From 0ef915a3ce5f39005e279d2513f1473ff862add5 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 7 Sep 2021 06:20:23 +0200
Subject: Adding upstream version 20210907.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 knot/bin/knot-reset-zones        | 58 ++++++++++++++++++++++++++++++++++++++++
 knot/bin/knot-zone-reset         | 53 ------------------------------------
 knot/share/cron/knot-reset-zones |  3 +++
 knot/share/cron/knot-zone-reset  |  3 ---
 4 files changed, 61 insertions(+), 56 deletions(-)
 create mode 100755 knot/bin/knot-reset-zones
 delete mode 100755 knot/bin/knot-zone-reset
 create mode 100755 knot/share/cron/knot-reset-zones
 delete mode 100755 knot/share/cron/knot-zone-reset

(limited to 'knot')

diff --git a/knot/bin/knot-reset-zones b/knot/bin/knot-reset-zones
new file mode 100755
index 0000000..aae5ec1
--- /dev/null
+++ b/knot/bin/knot-reset-zones
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+set -e
+
+HOSTS="${*}"
+
+if [ -z "${HOSTS}" ]
+then
+	echo "Usage: ${0} localhost|[HOST1 HOST2 ...]" >&2
+	exit 1
+fi
+
+for HOST in ${HOSTS}
+do
+	case "${HOST}" in
+		localhost)
+			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
+
+			echo " done."
+			;;
+
+		*)
+			echo -n "'${HOST}': Resetting in-memory data for all zones..."
+
+			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."
+			;;
+	esac
+done
diff --git a/knot/bin/knot-zone-reset b/knot/bin/knot-zone-reset
deleted file mode 100755
index cc310b0..0000000
--- a/knot/bin/knot-zone-reset
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# Open Infrastructure: service-tools
-
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
-#
-# SPDX-License-Identifier: GPL-3.0+
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-set -e
-
-HOSTS="${*}"
-
-if [ -z "${HOSTS}" ]
-then
-	echo "Usage: ${0} localhost|[HOST1 HOST2 ...]" >&2
-	exit 1
-fi
-
-for HOST in ${HOSTS}
-do
-	case "${HOST}" in
-		localhost)
-			echo -n "Flushing zone memory..."
-
-			service knot stop
-			rm -rf /var/lib/knot/timers/*.mdb
-			service knot start
-
-			echo " done."
-			;;
-
-		*)
-			echo -n "Flushing ${HOST} zone memory..."
-
-			ssh "${HOST}" "sudo service knot stop && rm -rf /var/lib/knot/timers/*.mdb && sudo service knot start"
-
-			echo " done."
-			;;
-	esac
-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
-- 
cgit v1.2.3