From 53f636bbbfd5d49588c9c7a6c91be66f5be10f96 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 1 May 2022 00:02:33 +0200
Subject: Merging upstream version 20220430.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dehydrated/share/hooks/exit_hook.fix-permissions |  5 +++++
 dehydrated/share/hooks/exit_hook.service-reload  | 23 +++++++++++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'dehydrated/share')

diff --git a/dehydrated/share/hooks/exit_hook.fix-permissions b/dehydrated/share/hooks/exit_hook.fix-permissions
index 1e089f7..6a1958d 100755
--- a/dehydrated/share/hooks/exit_hook.fix-permissions
+++ b/dehydrated/share/hooks/exit_hook.fix-permissions
@@ -21,6 +21,11 @@
 
 set -e
 
+if [ ! -e /var/lib/dehydrated/certs ]
+then
+	exit 0
+fi
+
 echo " + Fixing permissions..."
 
 if getent group ssl-cert > /dev/null 2>&1
diff --git a/dehydrated/share/hooks/exit_hook.service-reload b/dehydrated/share/hooks/exit_hook.service-reload
index c3fbdc2..ebe2d23 100755
--- a/dehydrated/share/hooks/exit_hook.service-reload
+++ b/dehydrated/share/hooks/exit_hook.service-reload
@@ -37,17 +37,20 @@ do
 	fi
 done
 
-NUMBER="$(systemctl | grep -c 'kresd@[0-9].service')"
-
-if [ "${NUMBER}" -gt 0 ]
+if service kresd@1 status > /dev/null 2>&1
 then
-	echo -n "   + knot-resolver:"
+	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
+		for NUMBER in $(seq 1 "${NUMBER}")
+		do
+			echo -n " #${NUMBER}"
+			service kresd@${NUMBER} restart
+		done
 
-	echo " done."
+		echo " done."
+	fi
 fi
-- 
cgit v1.2.3