From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 28 Jun 2023 07:51:06 +0000 (+0200)
Subject: kresd.conf: don't install by default, drop from packages
X-Git-Tag: v6.0.2~38^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57bb9a170b70c5c8552bd10222e55589afa77b47;p=thirdparty%2Fknot-resolver.git

kresd.conf: don't install by default, drop from packages

Installing a legacy lua config by default would be confusing.
---

diff --git a/distro/pkg/arch/PKGBUILD b/distro/pkg/arch/PKGBUILD
index 7eea556e5..c62bbab09 100644
--- a/distro/pkg/arch/PKGBUILD
+++ b/distro/pkg/arch/PKGBUILD
@@ -47,7 +47,6 @@ build() {
         -D keyfile_default=/etc/trusted-key.key \
         -D systemd_files=enabled \
         -D client=enabled \
-        -D install_kresd_conf=enabled \
         -D malloc=jemalloc \
         -D unit_tests=enabled
     ninja -C build
diff --git a/distro/pkg/deb/knot-resolver-core.install b/distro/pkg/deb/knot-resolver-core.install
index a3275fdfe..c9dd93dfc 100644
--- a/distro/pkg/deb/knot-resolver-core.install
+++ b/distro/pkg/deb/knot-resolver-core.install
@@ -1,4 +1,3 @@
-etc/knot-resolver/kresd.conf
 usr/lib/systemd/system/kresd@.service lib/systemd/system/
 usr/lib/systemd/system/kres-cache-gc.service lib/systemd/system/
 usr/lib/systemd/system/kresd.target lib/systemd/system/
diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index 771d90253..6f0526818 100755
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -32,7 +32,6 @@ override_dh_auto_build:
 		-Ddnstap=enabled \
 		-Dkeyfile_default=/usr/share/dns/root.key \
 		-Droot_hints=/usr/share/dns/root.hints \
-		-Dinstall_kresd_conf=enabled \
 		-Dunit_tests=enabled \
 		-Dmalloc=jemalloc \
 		-Dc_args="$${CFLAGS}" \
diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index 28015626e..e181e5af1 100644
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -188,7 +188,6 @@ CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" meson build_rpm \
     -Dmanaged_ta=enabled \
     -Dkeyfile_default="%{_sharedstatedir}/knot-resolver/root.keys" \
     -Dinstall_root_keys=enabled \
-    -Dinstall_kresd_conf=enabled \
     -Dmalloc=jemalloc \
     --buildtype=plain \
     --prefix="%{_prefix}" \
@@ -266,7 +265,6 @@ getent passwd knot-resolver >/dev/null || useradd -r -g knot-resolver -d %{_sysc
 %doc %{_pkgdocdir}/NEWS
 %doc %{_pkgdocdir}/examples
 %dir %{_sysconfdir}/knot-resolver
-%config(noreplace) %{_sysconfdir}/knot-resolver/kresd.conf
 %config(noreplace) %{_sysconfdir}/knot-resolver/root.hints
 %{_sysconfdir}/knot-resolver/icann-ca.pem
 %attr(750,knot-resolver,knot-resolver) %dir %{_sharedstatedir}/knot-resolver
diff --git a/meson_options.txt b/meson_options.txt
index 89b792994..ee8b576aa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -35,8 +35,8 @@ option(
     'enabled',
     'disabled',
   ],
-  value: 'auto',
-  description: 'creates kresd.conf in config directory',
+  value: 'disabled',
+  description: 'creates kresd.conf in config directory (legacy for version before 6)',
 )
 
 option(