From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 21 Jan 2020 14:00:01 +0000 (+0100)
Subject: upgrade: use /var/lib path for config instead of /etc
X-Git-Tag: v5.0.0~1^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19830c2e42e5382f98b61cf27f9ea4176f1e642d;p=thirdparty%2Fknot-resolver.git

upgrade: use /var/lib path for config instead of /etc
---

diff --git a/distro/arch/install b/distro/arch/install
index e0104163c..c2de76d78 100644
--- a/distro/arch/install
+++ b/distro/arch/install
@@ -5,9 +5,11 @@ post_install() {
 }
 
 pre_upgrade() {
-  if [ -f /lib/systemd/system/kresd.socket ] ; then
-    export UPG_DIR=%{_sysconfdir}/knot-resolver/.upgrade-4-to-5
+  # upgrade from 4.x to 5.x - save socket interfaces before package uninstall
+  if [ -f /usr/lib/systemd/system/kresd.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.socket kresd-tls.socket kresd-webmgmt.socket kresd-doh.socket ; do
       if systemctl is-enabled ${sock} 2>/dev/null | grep -qv masked ; then
@@ -28,16 +30,18 @@ pre_upgrade() {
 }
 
 post_upgrade() {
-  chown -R root:knot-resolver /etc/knot-resolver
-
-  export UPG_DIR=%{_sysconfdir}/knot-resolver/.upgrade-4-to-5
+  # upgrade from 4.x to 5.x - convert systemd socket configs to net.listen() format
+  export UPG_DIR=/var/lib/knot-resolver/.upgrade-4-to-5
   if [ -f ${UPG_DIR}/.unfinished ] ; then
     rm -f ${UPG_DIR}/.unfinished
-    kresd -c %{_libdir}/knot-resolver/upgrade-4-to-5.lua &>/dev/null
+    kresd -c /usr/lib/knot-resolver/upgrade-4-to-5.lua &>/dev/null
     echo -e "\n   !!! WARNING !!!"
     echo -e "Knot Resolver configuration file requires manual upgrade.\n"
     cat ${UPG_DIR}/kresd.conf.net 2>/dev/null
   fi
+
+  chown -R root:knot-resolver /etc/knot-resolver
+  chown -R root:knot-resolver /var/lib/knot-resolver
 }
 
 post_remove() {
diff --git a/distro/deb/knot-resolver.postinst b/distro/deb/knot-resolver.postinst
index a74765ba0..c11c095a8 100644
--- a/distro/deb/knot-resolver.postinst
+++ b/distro/deb/knot-resolver.postinst
@@ -2,7 +2,7 @@
 set -e
 
 # upgrade-4-to-5
-export UPG_DIR=/etc/knot-resolver/.upgrade-4-to-5
+export UPG_DIR=/var/lib/knot-resolver/.upgrade-4-to-5
 if [ -f ${UPG_DIR}/.unfinished ] ; then
        rm -f ${UPG_DIR}/.unfinished
        kresd -c /usr/lib/knot-resolver/upgrade-4-to-5.lua >/dev/null 2>/dev/null
diff --git a/distro/deb/knot-resolver.preinst b/distro/deb/knot-resolver.preinst
index 62dc01849..568ade248 100644
--- a/distro/deb/knot-resolver.preinst
+++ b/distro/deb/knot-resolver.preinst
@@ -3,7 +3,7 @@ set -e
 
 # upgrade-4-to-5
 if [ -f /lib/systemd/system/kresd.socket ] ; then
-       export UPG_DIR=/etc/knot-resolver/.upgrade-4-to-5
+       export UPG_DIR=/var/lib/knot-resolver/.upgrade-4-to-5
        mkdir -p ${UPG_DIR}
        touch ${UPG_DIR}/.unfinished
 
diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index c0171461e..8ff862602 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -206,7 +206,7 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 %if "x%{?rhel}" == "x"
 # upgrade-4-to-5
 if [ -f %{_unitdir}/kresd.socket ] ; then
-	export UPG_DIR=%{_sysconfdir}/knot-resolver/.upgrade-4-to-5
+	export UPG_DIR=%{_sharedstatedir}/knot-resolver/.upgrade-4-to-5
 	mkdir -p ${UPG_DIR}
 	touch ${UPG_DIR}/.unfinished
 
@@ -232,7 +232,7 @@ fi
 %post
 # upgrade-4-to-5
 %if "x%{?rhel}" == "x"
-export UPG_DIR=%{_sysconfdir}/knot-resolver/.upgrade-4-to-5
+export UPG_DIR=%{_sharedstatedir}/knot-resolver/.upgrade-4-to-5
 if [ -f ${UPG_DIR}/.unfinished ] ; then
 	rm -f ${UPG_DIR}/.unfinished
 	kresd -c %{_libdir}/knot-resolver/upgrade-4-to-5.lua &>/dev/null
diff --git a/utils/upgrade/meson.build b/utils/upgrade/meson.build
index 19cc4200f..b5ddc0344 100644
--- a/utils/upgrade/meson.build
+++ b/utils/upgrade/meson.build
@@ -2,6 +2,7 @@
 
 upgrade_config = configuration_data()
 upgrade_config.set('etc_dir', etc_dir)
+upgrade_config.set('systemd_work_dir', systemd_work_dir)
 
 configure_file(
   input: 'upgrade-4-to-5.lua.in',
diff --git a/utils/upgrade/upgrade-4-to-5.lua.in b/utils/upgrade/upgrade-4-to-5.lua.in
index 93f79f1fe..212e0e10c 100644
--- a/utils/upgrade/upgrade-4-to-5.lua.in
+++ b/utils/upgrade/upgrade-4-to-5.lua.in
@@ -1,4 +1,4 @@
-local upg_dir = '@etc_dir@/.upgrade-4-to-5'
+local upg_dir = '@systemd_work_dir@/.upgrade-4-to-5'
 local out = upg_dir..'/kresd.conf.net'
 local sockets = {
 	{ file='kresd.socket', kind='dns' },