From f798ddd4922d793d5e6ccb7c4111810d549ff4f4 Mon Sep 17 00:00:00 2001 From: Gaspard d'Hautefeuille Date: Wed, 9 Jul 2025 07:55:37 +0200 Subject: [mod] migrate from Redis to Valkey (#4795) This patch migrates from `redis==5.2.1` [1] to `valkey==6.1.0` [2]. The migration to valkey is necessary because the company behind Redis has decided to abandon the open source license. After experiencing a drop in user numbers, they now want to run it under a dual license again. But this move demonstrates once again how unreliable the company is and how it treats open source developers. To review first, read the docs:: $ make docs.live Follow the instructions to remove redis: - http://0.0.0.0:8000/admin/settings/settings_redis.html Config and install a local valkey DB: - http://0.0.0.0:8000/admin/settings/settings_valkey.html [1] https://pypi.org/project/redis/ [2] https://pypi.org/project/valkey/ Co-authored-by: HLFH Co-authored-by: Markus Heiser --- manage | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'manage') diff --git a/manage b/manage index ee2a29281..22f3ae821 100755 --- a/manage +++ b/manage @@ -35,8 +35,8 @@ source "$(dirname "${BASH_SOURCE[0]}")/utils/lib_sxng_test.sh" # shellcheck source=utils/lib_go.sh source "$(dirname "${BASH_SOURCE[0]}")/utils/lib_go.sh" -# shellcheck source=utils/lib_redis.sh -source "$(dirname "${BASH_SOURCE[0]}")/utils/lib_redis.sh" +# shellcheck source=utils/lib_valkey.sh +source "$(dirname "${BASH_SOURCE[0]}")/utils/lib_valkey.sh" # shellcheck source=utils/lib_sxng_vite.sh source "$(dirname "${BASH_SOURCE[0]}")/utils/lib_sxng_vite.sh" @@ -52,12 +52,6 @@ GECKODRIVER_VERSION="v0.35.0" BLACK_OPTIONS=("--target-version" "py311" "--line-length" "120" "--skip-string-normalization") BLACK_TARGETS=("--exclude" "(searx/static|searx/languages.py)" "--include" 'searxng.msg|\.pyi?$' "searx" "searxng_extra" "tests") -_dev_redis_sock="/usr/local/searxng-redis/run/redis.sock" -# set SEARXNG_REDIS_URL if it is not defined and "{_dev_redis_sock}" exists. -if [ -S "${_dev_redis_sock}" ] && [ -z "${SEARXNG_REDIS_URL}" ]; then - export SEARXNG_REDIS_URL="unix://${_dev_redis_sock}?db=0" -fi - YAMLLINT_FILES=() while IFS= read -r line; do if [ "$line" != "tests/unit/settings/syntaxerror_settings.yml" ]; then @@ -83,10 +77,8 @@ docs.: gecko.driver: download & install geckodriver if not already installed (required for robot_tests) -redis: - build : build redis binaries at $(redis._get_dist) - install : create user (${REDIS_USER}) and install systemd service (${REDIS_SERVICE_NAME}) - help : show more redis commands +valkey: + install : create user (${VALKEY_USER}) and install systemd service (${VALKEY_SERVICE_NAME}) py.: build : Build python packages at ./${PYDIST} clean : delete virtualenv and intermediate py files @@ -109,7 +101,7 @@ EOF vite.help cat <