Merge branch 'deb-restart-kres-gc' into 'master'

packaging: ensure GC is restarted on pkg update

See merge request !935

distro/deb/knot-resolver.postinst

@@ -23,7 +23,7 @@ if [ "$1" = "triggered" ]; then
         # use daemon-reload to load any unit changes
         systemctl daemon-reload || true
         # systemctl of the sub-services is the preferred method to restart
-        systemctl try-restart 'kresd@*.service' || true
+        systemctl try-restart 'kresd@*.service' kres-cache-gc.service || true
     fi
     exit 0
 fi
@@ -31,7 +31,7 @@ fi
 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
     systemctl daemon-reload || true
     systemd-tmpfiles --create /usr/lib/tmpfiles.d/knot-resolver.conf
-    systemctl try-restart 'kresd@*.service' || true
+    systemctl try-restart 'kresd@*.service' kres-cache-gc.service || true
 fi
 
 #DEBHELPER#

distro/rpm/knot-resolver.spec

@@ -132,7 +132,7 @@ Requires:       lua-mmdb
 
 %description module-http
 HTTP/2 module for Knot Resolver has multiple uses. It enables use of
-DNS-over-HTTP, can serve as API ednpoint for other modules or provide a web
+DNS-over-HTTP, can serve as API endpoint for other modules or provide a web
 interface for local visualization of the resolver cache and queries.
 %endif
 
@@ -238,9 +238,14 @@ if [ -f ${UPG_DIR}/.unfinished ] ; then
 fi
 %endif
 
-# in case service files are updated
-systemctl daemon-reload &>/dev/null ||:
-%systemd_post 'kresd@*.service'
+# 5.0.1 fix to force restart of kres-cache-gc.service, which was missing in systemd_postun_with_restart
+# TODO: remove once most users upgrade to 5.0.1+
+systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 2 ] ; then
+        systemctl try-restart kres-cache-gc.service >/dev/null 2>&1 || :
+fi
+
+# systemd_post macro is not needed for anything (calls systemctl preset)
 %tmpfiles_create %{_tmpfilesdir}/knot-resolver.conf
 %if "x%{?fedora}" == "x"
 /sbin/ldconfig
@@ -250,7 +255,7 @@ systemctl daemon-reload &>/dev/null ||:
 %systemd_preun kres-cache-gc.service kresd.target
 
 %postun
-%systemd_postun_with_restart 'kresd@*.service'
+%systemd_postun_with_restart 'kresd@*.service' kres-cache-gc.service
 %if "x%{?fedora}" == "x"
 /sbin/ldconfig
 %endif