From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 22 Jan 2020 11:23:30 +0000 (+0100)
Subject: distro/deb: save systemd socket conf before http module uninstall
X-Git-Tag: v5.0.0~1^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeced046a018400b80ffd02b492fa7e7e0523c49;p=thirdparty%2Fknot-resolver.git

distro/deb: save systemd socket conf before http module uninstall
---

diff --git a/distro/deb/knot-resolver-module-http.preinst b/distro/deb/knot-resolver-module-http.preinst
new file mode 100644
index 000000000..727461061
--- /dev/null
+++ b/distro/deb/knot-resolver-module-http.preinst
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+# upgrade-4-to-5
+if [ -f /lib/systemd/system/kresd-doh.socket ] ; then
+       export UPG_DIR=/var/lib/knot-resolver/.upgrade-4-to-5
+       mkdir -p ${UPG_DIR}
+       touch ${UPG_DIR}/.unfinished
+
+       for sock in kresd-webmgmt.socket kresd-doh.socket ; do
+               if systemctl is-enabled ${sock} 2>/dev/null | grep -qv masked ; then
+                       systemctl show ${sock} -p Listen > ${UPG_DIR}/${sock}
+                       case "$(systemctl show ${sock} -p BindIPv6Only)" in
+                       *ipv6-only)
+                               touch ${UPG_DIR}/${sock}.v6only
+                               ;;
+                       *default)
+                               if cat /proc/sys/net/ipv6/bindv6only | grep -q 1 ; then
+                                       touch ${UPG_DIR}/${sock}.v6only
+                               fi
+                               ;;
+                       esac
+               fi
+       done
+fi
diff --git a/distro/deb/knot-resolver.preinst b/distro/deb/knot-resolver.preinst
index 568ade248..3d970799d 100644
--- a/distro/deb/knot-resolver.preinst
+++ b/distro/deb/knot-resolver.preinst
@@ -7,7 +7,7 @@ if [ -f /lib/systemd/system/kresd.socket ] ; then
        mkdir -p ${UPG_DIR}
        touch ${UPG_DIR}/.unfinished
 
-       for sock in kresd.socket kresd-tls.socket kresd-webmgmt.socket kresd-doh.socket ; do
+       for sock in kresd.socket kresd-tls.socket ; do
                if systemctl is-enabled ${sock} 2>/dev/null | grep -qv masked ; then
                        systemctl show ${sock} -p Listen > ${UPG_DIR}/${sock}
                        case "$(systemctl show ${sock} -p BindIPv6Only)" in