From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Tue, 30 Sep 2025 05:52:49 +0000 (+0200)
Subject: distro: rename redis-knot to redis-module-knot or valkey-module-knot
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dd718a870bf1bffdf298fe4d4dad852f0492493;p=thirdparty%2Fknot-dns.git

distro: rename redis-knot to redis-module-knot or valkey-module-knot

Install the module to:
- /usr/lib/x86_64-linux-gnu/redis/modules/ for DEB
- /usr/lib64/valkey/modules/ for RPM
---

diff --git a/distro/pkg/deb/control b/distro/pkg/deb/control
index d92d21532f..32f42080e2 100644
--- a/distro/pkg/deb/control
+++ b/distro/pkg/deb/control
@@ -217,7 +217,7 @@ Description: geoip module for Knot DNS
  registry and hence is well suited to run anything from the root
  zone, the top-level domain, to many smaller standard domain names.
 
-Package: redis-knot
+Package: redis-module-knot
 Architecture: any
 Depends:
  ${misc:Depends},
diff --git a/distro/pkg/deb/redis-knot.install b/distro/pkg/deb/redis-knot.install
deleted file mode 100644
index 2f4cf90599..0000000000
--- a/distro/pkg/deb/redis-knot.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/knot/redis/knot.so usr/lib/redis/modules/
diff --git a/distro/pkg/deb/redis-module-knot.install b/distro/pkg/deb/redis-module-knot.install
new file mode 100644
index 0000000000..e5566e4880
--- /dev/null
+++ b/distro/pkg/deb/redis-module-knot.install
@@ -0,0 +1 @@
+usr/lib/*/redis/modules/knot.so
diff --git a/distro/pkg/deb/rules b/distro/pkg/deb/rules
index fbf65bd090..08ae9ca1fa 100755
--- a/distro/pkg/deb/rules
+++ b/distro/pkg/deb/rules
@@ -36,6 +36,7 @@ override_dh_auto_configure:
 	  --libexecdir=/usr/lib/knot \
 	  --with-rundir=/run/knot \
 	  --with-moduledir=/usr/lib/$(DEB_HOST_MULTIARCH)/knot/modules-$(BASE_VERSION) \
+	  --with-redisdir=/usr/lib/$(DEB_HOST_MULTIARCH)/redis/modules \
 	  --with-storage=/var/lib/knot \
 	  --enable-systemd=auto \
 	  --enable-dnstap \
@@ -66,8 +67,8 @@ override_dh_auto_install-arch:
 	  echo "Stripping the QUIC symbols"; \
 	  sed -i '/knot_quic_/d' $(LIBKNOT_SYMBOLS); \
 	fi
-	@if [ -f "$(CURDIR)/debian/tmp/usr/lib/*/knot/redis/knot.so" ]; then \
-	  chmod 0755 $(CURDIR)/debian/tmp/usr/lib/*/knot/redis/knot.so; \
+	@if [ -f "$(CURDIR)/debian/tmp/usr/lib/*/redis/modules/knot.so" ]; then \
+	  chmod 0755 $(CURDIR)/debian/tmp/usr/lib/*/redis/modules/knot.so; \
 	fi
 
 override_dh_auto_install-indep:
diff --git a/distro/pkg/rpm/knot.spec b/distro/pkg/rpm/knot.spec
index c9ea594279..d6a9e055cd 100644
--- a/distro/pkg/rpm/knot.spec
+++ b/distro/pkg/rpm/knot.spec
@@ -174,12 +174,12 @@ Requires:	%{name}-libs = %{version}-%{release}
 %description -n python3-libknot
 The package provides Python bindings for the libknot shared library.
 
-%package -n redis-knot
-Summary:	Redis module for Knot DNS.
+%package -n valkey-module-knot
+Summary:	Valkey module for Knot DNS.
 Requires:	%{name}-libs = %{version}-%{release}
 
-%description -n redis-knot
-The package provides Redis module for Knot DNS.
+%description -n valkey-module-knot
+The package provides Valkey module for Knot DNS.
 
 %package doc
 Summary:	Documentation for the Knot DNS server
@@ -216,6 +216,7 @@ CFLAGS="%{optflags} -DNDEBUG -Wno-unused"
   --libexecdir=/usr/lib/knot \
   --with-rundir=/run/knot \
   --with-moduledir=%{_libdir}/knot/modules-%{BASE_VERSION} \
+  --with-redisdir=%{_libdir}/valkey/modules \
   --with-storage=/var/lib/knot \
   %{?configure_db_sizes} \
   %{?configure_quic} \
@@ -396,8 +397,8 @@ getent passwd knot >/dev/null || \
 %{python3_sitelib}/libknot
 %{python3_sitelib}/libknot-*-info
 
-%files -n redis-knot
-%attr(0755, root, root) %{_libdir}/knot/redis/knot.so
+%files -n valkey-module-knot
+%attr(0755, root, root) %{_libdir}/valkey/modules/knot.so
 
 %files libs
 %license COPYING
diff --git a/doc/configuration.rst b/doc/configuration.rst
index 513a68a200..b9c2aac74b 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -829,11 +829,16 @@ or write to the same database. However, if multiple writers are used, they
 must be configured carefully to avoid conflicts or unexpected interactions.
 
 On the database side, the ``knot`` module must be available (e.g. by installing
-the ``redis-knot`` package from a `repository <https://www.knot-dns.cz/download/>`_)
-and loaded into the database. This is usually done by adding the following
-line to the database configuration::
+the ``redis-module-knot`` or ``valkey-module-knot`` package from
+a `repository <https://www.knot-dns.cz/download/>`_)
+and loaded into the database. This is usually done by adding one of the following
+lines to the database configuration::
 
-  loadmodule /usr/lib/redis/modules/knot.so [<parameter> <value>]...
+  loadmodule /usr/lib/x86_64-linux-gnu/redis/modules/knot.so [<parameter> <value>]...
+
+or::
+
+  loadmodule /usr/lib64/valkey/modules/knot.so [<parameter> <value>]...
 
 where the optional module parameters are: