Merging upstream version 20221030.

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

4 files changed, 98 insertions, 23 deletions

diff --git a/knot/bin/knot-reset-zones b/kea/bin/kea-leases-reset
index 40779cf..92265f4 100755
--- a/knot/bin/knot-reset-zones
+++ b/kea/bin/kea-leases-reset
@@ -21,38 +21,38 @@
 
 set -e
 
-HOSTS="${*}"
-
-if [ -z "${HOSTS}" ]
-then
-	echo "Usage: ${0} localhost|[HOST1 HOST2 ...]" >&2
-	exit 1
-fi
+HOSTS="${*:-localhost}"
 
 for HOST in ${HOSTS}
 do
 	case "${HOST}" in
 		localhost)
-			echo -n "Resetting in-memory data for all zones..."
+			echo "Removing all leases..."
+
+			sudo service kea-dhcp6-server stop
+			sudo service kea-dhcp4-server stop
 
-			service knot stop
-			rm -rf /var/lib/knot/journal/*.mdb
-			rm -rf /var/lib/knot/timers/*.mdb
-			service knot start
+			sudo rm -f /var/lib/kea/*.csv*
 
-			echo " done."
+			sudo service kea-dhcp6-server start
+			sudo service kea-dhcp4-server start
+
+			echo
+			echo "done."
 			;;
 
 		*)
-			echo -n "'${HOST}': Resetting in-memory data for all zones..."
+			echo "'${HOST}': Removing all leases..."
 
 			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."
+				"sudo service kea-dhcp6-server stop; \
+				sudo service kea-dhcp4-server stop; \
+				sudo rm -f /var/lib/kea/*.csv*; \
+				sudo service kea-dhcp6-server start; \
+				sudo service kea-dhcp4-server start"
+
+			echo
+			echo "done."
 			;;
 	esac
 done
diff --git a/knot/bin/knot-zones-reset b/knot/bin/knot-zones-reset
new file mode 100755
index 0000000..6471cf4
--- /dev/null
+++ b/knot/bin/knot-zones-reset
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# Open Infrastructure: service-tools
+
+# Copyright (C) 2014-2022 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="${*:-localhost}"
+
+for HOST in ${HOSTS}
+do
+	case "${HOST}" in
+		localhost)
+			echo "Resetting in-memory data for all zones..."
+
+			sudo service knot stop
+
+			sudo rm -rf /var/lib/knot/journal/*.mdb
+			sudo rm -rf /var/lib/knot/timers/*.mdb
+
+			if [ -e /var/lib/knot/zones/.git ]
+			then
+				sudo chown -R root:root /var/lib/knot/zones/
+
+				cd /var/lib/knot/zones
+				sudo git clean -dxf
+				sudo git checkout -f
+
+				sudo chown -R knot:knot /var/lib/knot/zones/
+			fi
+
+			sudo service knot start
+
+			echo
+			echo "done."
+			;;
+
+		*)
+			echo "'${HOST}': Resetting in-memory data for all zones..."
+
+			ssh "${HOST}" \
+				"sudo service knot stop && \
+				sudo rm -rf /var/lib/knot/journal/*.mdb && \
+				sudo rm -rf /var/lib/knot/timers/*.mdb && \
+				if [ -e /var/lib/knot/zones/.git ]; \
+				then \
+					sudo chown -R root:root /var/lib/knot/zones/; \
+					cd /var/lib/knot/zones; \
+					sudo git clean -dxf; \
+					sudo git checkout -f; \
+					sudo chown -R knot:knot /var/lib/knot/zones/; \
+				fi; \
+				sudo service knot start"
+
+			echo
+			echo "done."
+			;;
+	esac
+done
diff --git a/knot/share/cron/knot-reset-zones b/knot/share/cron/knot-reset-zones
deleted file mode 100755
index 9762da4..0000000
--- a/knot/share/cron/knot-reset-zones
+++ /dev/null
@@ -1,3 +0,0 @@
-# /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-zones-reset b/knot/share/cron/knot-zones-reset
new file mode 100755
index 0000000..13dfd44
--- /dev/null
+++ b/knot/share/cron/knot-zones-reset
@@ -0,0 +1,3 @@
+# /etc/cron.d/knot-zones-reset
+
+0 0 * * *	root	/usr/bin/knot-zones-reset > /dev/null 2>&1