Loading pkgs/servers/web-apps/netbox/config.patch +7 −7 Original line number Diff line number Diff line diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 0ad211416..c70710810 100644 index 2de06dd10..00406af48 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -235,6 +235,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get('PASSWORD', '') TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0) @@ -236,6 +236,7 @@ TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0) TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False) TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False) TASKS_REDIS_CA_CERT_PATH = TASKS_REDIS.get('CA_CERT_PATH', False) +TASKS_REDIS_URL = TASKS_REDIS.get('URL') # Caching if 'caching' not in REDIS: @@ -251,11 +252,12 @@ CACHING_REDIS_SENTINELS = REDIS['caching'].get('SENTINELS', []) CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'default') @@ -253,11 +254,12 @@ CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'defau CACHING_REDIS_PROTO = 'rediss' if REDIS['caching'].get('SSL', False) else 'redis' CACHING_REDIS_SKIP_TLS_VERIFY = REDIS['caching'].get('INSECURE_SKIP_TLS_VERIFY', False) CACHING_REDIS_CA_CERT_PATH = REDIS['caching'].get('CA_CERT_PATH', False) +CACHING_REDIS_URL = REDIS['caching'].get('URL', f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}') CACHES = { Loading @@ -24,7 +24,7 @@ index 0ad211416..c70710810 100644 'OPTIONS': { 'CLIENT_CLASS': 'django_redis.client.DefaultClient', 'PASSWORD': CACHING_REDIS_PASSWORD, @@ -404,7 +406,7 @@ USE_X_FORWARDED_HOST = True @@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True X_FRAME_OPTIONS = 'SAMEORIGIN' # Static files (CSS, JavaScript, Images) Loading @@ -33,7 +33,7 @@ index 0ad211416..c70710810 100644 STATIC_URL = f'/{BASE_PATH}static/' STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'project-static', 'dist'), @@ -634,6 +636,14 @@ if TASKS_REDIS_USING_SENTINEL: @@ -640,6 +642,14 @@ if TASKS_REDIS_USING_SENTINEL: 'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT }, } Loading pkgs/servers/web-apps/netbox/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; version = "3.4.2"; version = "3.4.3"; format = "other"; Loading @@ -26,7 +26,7 @@ py.pkgs.buildPythonApplication rec { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; sha256 = "sha256-NMvNI5toPngVVUnxY6+U3Pdj9VGGGXTrB8YIcrQguZE="; sha256 = "sha256-M/CbnlnRaWuwcJJofY5mPpVTl9zYrApsXqV9hilNyvw="; }; patches = [ Loading Loading
pkgs/servers/web-apps/netbox/config.patch +7 −7 Original line number Diff line number Diff line diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 0ad211416..c70710810 100644 index 2de06dd10..00406af48 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -235,6 +235,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get('PASSWORD', '') TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0) @@ -236,6 +236,7 @@ TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0) TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False) TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False) TASKS_REDIS_CA_CERT_PATH = TASKS_REDIS.get('CA_CERT_PATH', False) +TASKS_REDIS_URL = TASKS_REDIS.get('URL') # Caching if 'caching' not in REDIS: @@ -251,11 +252,12 @@ CACHING_REDIS_SENTINELS = REDIS['caching'].get('SENTINELS', []) CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'default') @@ -253,11 +254,12 @@ CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'defau CACHING_REDIS_PROTO = 'rediss' if REDIS['caching'].get('SSL', False) else 'redis' CACHING_REDIS_SKIP_TLS_VERIFY = REDIS['caching'].get('INSECURE_SKIP_TLS_VERIFY', False) CACHING_REDIS_CA_CERT_PATH = REDIS['caching'].get('CA_CERT_PATH', False) +CACHING_REDIS_URL = REDIS['caching'].get('URL', f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}') CACHES = { Loading @@ -24,7 +24,7 @@ index 0ad211416..c70710810 100644 'OPTIONS': { 'CLIENT_CLASS': 'django_redis.client.DefaultClient', 'PASSWORD': CACHING_REDIS_PASSWORD, @@ -404,7 +406,7 @@ USE_X_FORWARDED_HOST = True @@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True X_FRAME_OPTIONS = 'SAMEORIGIN' # Static files (CSS, JavaScript, Images) Loading @@ -33,7 +33,7 @@ index 0ad211416..c70710810 100644 STATIC_URL = f'/{BASE_PATH}static/' STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'project-static', 'dist'), @@ -634,6 +636,14 @@ if TASKS_REDIS_USING_SENTINEL: @@ -640,6 +642,14 @@ if TASKS_REDIS_USING_SENTINEL: 'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT }, } Loading
pkgs/servers/web-apps/netbox/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -18,7 +18,7 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; version = "3.4.2"; version = "3.4.3"; format = "other"; Loading @@ -26,7 +26,7 @@ py.pkgs.buildPythonApplication rec { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; sha256 = "sha256-NMvNI5toPngVVUnxY6+U3Pdj9VGGGXTrB8YIcrQguZE="; sha256 = "sha256-M/CbnlnRaWuwcJJofY5mPpVTl9zYrApsXqV9hilNyvw="; }; patches = [ Loading