diff options
| author | Minijackson <minijackson@riseup.net> | 2023-01-21 15:55:45 +0100 |
|---|---|---|
| committer | Raito Bezarius <masterancpp@gmail.com> | 2023-04-04 11:45:30 +0200 |
| commit | eeb17fca1c436efbf05609f0050a868e737dca6b (patch) | |
| tree | 916b4c79edfd9d4f37118fb1f1f2dc850d22ea3c /pkgs/servers/web-apps | |
| parent | 52f3031f23ee770c986307ce0577c7feb5812474 (diff) | |
netbox: 3.4.2 -> 3.4.3
Diffstat (limited to 'pkgs/servers/web-apps')
| -rw-r--r-- | pkgs/servers/web-apps/netbox/config.patch | 14 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/netbox/default.nix | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/servers/web-apps/netbox/config.patch b/pkgs/servers/web-apps/netbox/config.patch index c7025476b4c40..a2e0b0b95a871 100644 --- a/pkgs/servers/web-apps/netbox/config.patch +++ b/pkgs/servers/web-apps/netbox/config.patch @@ -1,19 +1,19 @@ 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 = { @@ -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) @@ -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 }, } diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index ddf98da4c8e04..a685dba30c6e3 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -18,7 +18,7 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "3.4.2"; + version = "3.4.3"; format = "other"; @@ -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 = [ |