From 82a422c3deabb76dd15dc59861f3ef6f57122cd4 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Mon, 15 Mar 2021 23:56:41 +0100
Subject: [PATCH] Add Redis password to URL setting as well
The Celery broker URL requires the password to be passed directly
---
aleksis/core/settings.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index f75b9bac7..038eb524e 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -213,10 +213,13 @@ merge_app_settings("DATABASES", DATABASES, False)
REDIS_HOST = _settings.get("redis.host", "localhost")
REDIS_PORT = _settings.get("redis.port", 6379)
REDIS_DB = _settings.get("redis.database", 0)
-REDIS_USER = _settings.get("redis.user", None)
+REDIS_USER = _settings.get("redis.user", "default")
REDIS_PASSWORD = _settings.get("redis.password", None)
-REDIS_URL = f"redis://{REDIS_USER+'@' if REDIS_USER else ''}{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}"
+REDIS_URL = (
+ f"redis://{REDIS_USER}{':'+REDIS_PASSWORD if REDIS_PASSWORD else ''}@"
+ f"{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}"
+)
if _settings.get("caching.redis.enabled", not IN_PYTEST):
CACHES = {
--
GitLab