From 64b763429f5ad8b4b9db69a9896869473ffe570d Mon Sep 17 00:00:00 2001 From: Ryan Merolle Date: Wed, 1 Apr 2020 23:41:35 -0400 Subject: [PATCH 1/2] update configuration.py for netbox 2.7.11 REDIS config update configuration.py to use REDIS config referencing `tasks` in place of `webhooks` --- configuration/configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/configuration.py b/configuration/configuration.py index af5d3ba..9ebbff0 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -51,7 +51,7 @@ SECRET_KEY = os.environ.get('SECRET_KEY', read_secret('secret_key')) # Redis database settings. The Redis database is used for caching and background processing such as webhooks REDIS = { - 'webhooks': { + 'tasks': { 'HOST': os.environ.get('REDIS_HOST', 'localhost'), 'PORT': int(os.environ.get('REDIS_PORT', 6379)), 'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')), From 1bc1ab2a0adb732b270df6f823957b9d7b0ca77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=A4der?= Date: Thu, 14 May 2020 16:19:38 +0200 Subject: [PATCH 2/2] Preserve compatibility --- configuration/configuration.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configuration/configuration.py b/configuration/configuration.py index 9ebbff0..cc438df 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -59,6 +59,14 @@ REDIS = { 'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)), 'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true', }, + 'webhooks': { # legacy setting, can be removed after Netbox seizes support for it + 'HOST': os.environ.get('REDIS_HOST', 'localhost'), + 'PORT': int(os.environ.get('REDIS_PORT', 6379)), + 'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')), + 'DATABASE': int(os.environ.get('REDIS_DATABASE', 0)), + 'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)), + 'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true', + }, 'caching': { 'HOST': os.environ.get('REDIS_CACHE_HOST', os.environ.get('REDIS_HOST', 'localhost')), 'PORT': int(os.environ.get('REDIS_CACHE_PORT', os.environ.get('REDIS_PORT', 6379))),