From: Oto Šťáva <oto.stava@nic.cz>
Date: Tue, 2 Apr 2024 09:29:29 +0000 (+0200)
Subject: distro/pkg/rpm: use noreplace for config.yaml
X-Git-Tag: v6.0.8~30^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7b1581623900b8c342e1ba08a683592878c3f8c;p=thirdparty%2Fknot-resolver.git

distro/pkg/rpm: use noreplace for config.yaml

Adds `%config(noreplace)` to `config.yaml`. This prevents the package
from overwriting the user's edited configuration upon update, and
instead adds the new default configuration as a `.rpmnew` file for the
user to potentially consider.
---

diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index 2ba5383ad..95d8af520 100644
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -345,7 +345,7 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 
 %files -n knot-resolver-manager
 %{python3_sitearch}/knot_resolver_manager*
-%{_sysconfdir}/knot-resolver/config.yaml
+%config(noreplace) %{_sysconfdir}/knot-resolver/config.yaml
 %{_unitdir}/knot-resolver.service
 %{_bindir}/kresctl
 %{_bindir}/knot-resolver