Adding upstream version 20220414.upstream/20220414

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

3 files changed, 28 insertions, 2 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 954d841..52a6c18 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,12 @@
+2022-04-14	Daniel Baumann <daniel.baumann@open-infrastructure.net>
+
+	* Releasing version 20220414.
+
+	[ Daniel Baumann ]
+	* Adding knot to list of services to restart in dehydrated hook.
+	* Adding knot-resolver handling in dehydrated service-reload hook.
+	* Using a variable to keep the list of services to restart in dehydrated hook for easier readability.
+
 2022-01-05	Daniel Baumann <daniel.baumann@open-infrastructure.net>
 
 	* Releasing version 20220105.
diff --git a/VERSION.txt b/VERSION.txt
index 430a704..343bc37 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20220105
+20220414
diff --git a/dehydrated/share/hooks/exit_hook.service-reload b/dehydrated/share/hooks/exit_hook.service-reload
index daba7dd..c3fbdc2 100755
--- a/dehydrated/share/hooks/exit_hook.service-reload
+++ b/dehydrated/share/hooks/exit_hook.service-reload
@@ -21,9 +21,11 @@
 
 set -e
 
+SERVICES="apache2 haproxy knot postgresql redis-server"
+
 echo " + Reloading services..."
 
-for SERVICE in apache2 haproxy postgresql redis-server
+for SERVICE in ${SERVICES}
 do
 	if service ${SERVICE} status > /dev/null 2>&1
 	then
@@ -34,3 +36,18 @@ do
 		echo " done."
 	fi
 done
+
+NUMBER="$(systemctl | grep -c 'kresd@[0-9].service')"
+
+if [ "${NUMBER}" -gt 0 ]
+then
+	echo -n "   + knot-resolver:"
+
+	for NUMBER in $(seq 1 "${NUMBER}")
+	do
+		echo -n " #${NUMBER}"
+		service kresd@${NUMBER} restart
+	done
+
+	echo " done."
+fi