cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

netbox: 3.4.2 -> 3.4.3

Browse source
This commit is contained in:
Minijackson 2023-01-21 15:55:45 +01:00 committed by Raito Bezarius
parent 52f3031f23
commit eeb17fca1c
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/servers/web-apps/netbox/config.patch
View file

@ -1,19 +1,19 @@
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py 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 --- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py
@@ -235,6 +235,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get('PASSWORD', '') @@ -236,6 +236,7 @@ TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0)
TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0)
TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False) TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False)
TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', 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') +TASKS_REDIS_URL = TASKS_REDIS.get('URL')
# Caching # Caching
if 'caching' not in REDIS: if 'caching' not in REDIS:
@@ -251,11 +252,12 @@ CACHING_REDIS_SENTINELS = REDIS['caching'].get('SENTINELS', []) @@ -253,11 +254,12 @@ CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'defau
CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'default')
CACHING_REDIS_PROTO = 'rediss' if REDIS['caching'].get('SSL', False) else 'redis' 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_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}') +CACHING_REDIS_URL = REDIS['caching'].get('URL', f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}')
CACHES = { CACHES = {
@ -24,7 +24,7 @@ index 0ad211416..c70710810 100644
'OPTIONS': { 'OPTIONS': {
'CLIENT_CLASS': 'django_redis.client.DefaultClient', 'CLIENT_CLASS': 'django_redis.client.DefaultClient',
'PASSWORD': CACHING_REDIS_PASSWORD, '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' X_FRAME_OPTIONS = 'SAMEORIGIN'
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
@ -33,7 +33,7 @@ index 0ad211416..c70710810 100644
STATIC_URL = f'/{BASE_PATH}static/' STATIC_URL = f'/{BASE_PATH}static/'
STATICFILES_DIRS = ( STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'project-static', 'dist'), 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 'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT
}, },
} }

4
pkgs/servers/web-apps/netbox/default.nix
View file

@ -18,7 +18,7 @@ let
in in
py.pkgs.buildPythonApplication rec { py.pkgs.buildPythonApplication rec {
pname = "netbox"; pname = "netbox";
version = "3.4.2"; version = "3.4.3";
format = "other"; format = "other";
@ -26,7 +26,7 @@ py.pkgs.buildPythonApplication rec {
owner = "netbox-community"; owner = "netbox-community";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-NMvNI5toPngVVUnxY6+U3Pdj9VGGGXTrB8YIcrQguZE="; sha256 = "sha256-M/CbnlnRaWuwcJJofY5mPpVTl9zYrApsXqV9hilNyvw=";
}; };
patches = [ patches = [