4 files changed, 33 insertions, 36 deletions
diff --git a/knot/Makefile b/knot/Makefile
index a49dc34..a4f4977 100644
--- a/knot/Makefile
+++ b/knot/Makefile
@@ -1,6 +1,6 @@
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/knot/bin/knot-reset-zones b/knot/bin/knot-zones-reset
index 40779cf..d007906 100755
--- a/knot/bin/knot-reset-zones
+++ b/knot/bin/knot-zones-reset
@@ -2,7 +2,7 @@
 
 # Open Infrastructure: service-tools
 
-# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2023 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -21,38 +21,35 @@
 
 set -e
 
-HOSTS="${*}"
+echo "Resetting in-memory data for all zones..."
 
-if [ -z "${HOSTS}" ]
+if systemctl status knot | grep -qs 'Active: active'
 then
-	echo "Usage: ${0} localhost|[HOST1 HOST2 ...]" >&2
-	exit 1
+	START="true"
+	sudo service knot stop
+else
+	START="false"
 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
+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
+
+case "${START}" in
+	true)
+		sudo service knot start
+		;;
+esac
+
+echo
+echo "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