pyrox.dev
netbox: 3.4.2 -> 3.4.3
authored by Minijackson and committed by Raito Bezarius eeb17fca 52f3031f
+7
-7
pkgs/servers/web-apps/netbox/config.patch
+7
-7
pkgs/servers/web-apps/netbox/config.patch
···
1
1
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
2
-
index 0ad211416..c70710810 100644
2
+
index 2de06dd10..00406af48 100644
3
3
--- a/netbox/netbox/settings.py
4
4
+++ b/netbox/netbox/settings.py
5
-
@@ -235,6 +235,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get('PASSWORD', '')
6
-
TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0)
5
+
@@ -236,6 +236,7 @@ TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0)
7
6
TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False)
8
7
TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False)
8
+
TASKS_REDIS_CA_CERT_PATH = TASKS_REDIS.get('CA_CERT_PATH', False)
9
9
+TASKS_REDIS_URL = TASKS_REDIS.get('URL')
10
10
11
11
# Caching
12
12
if 'caching' not in REDIS:
13
-
@@ -251,11 +252,12 @@ CACHING_REDIS_SENTINELS = REDIS['caching'].get('SENTINELS', [])
14
-
CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'default')
13
+
@@ -253,11 +254,12 @@ CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'defau
15
14
CACHING_REDIS_PROTO = 'rediss' if REDIS['caching'].get('SSL', False) else 'redis'
16
15
CACHING_REDIS_SKIP_TLS_VERIFY = REDIS['caching'].get('INSECURE_SKIP_TLS_VERIFY', False)
16
+
CACHING_REDIS_CA_CERT_PATH = REDIS['caching'].get('CA_CERT_PATH', False)
17
17
+CACHING_REDIS_URL = REDIS['caching'].get('URL', f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}')
18
18
19
19
CACHES = {
···
24
24
'OPTIONS': {
25
25
'CLIENT_CLASS': 'django_redis.client.DefaultClient',
26
26
'PASSWORD': CACHING_REDIS_PASSWORD,
27
-
@@ -404,7 +406,7 @@ USE_X_FORWARDED_HOST = True
27
+
@@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True
28
28
X_FRAME_OPTIONS = 'SAMEORIGIN'
29
29
30
30
# Static files (CSS, JavaScript, Images)
···
33
33
STATIC_URL = f'/{BASE_PATH}static/'
34
34
STATICFILES_DIRS = (
35
35
os.path.join(BASE_DIR, 'project-static', 'dist'),
36
-
@@ -634,6 +636,14 @@ if TASKS_REDIS_USING_SENTINEL:
36
+
@@ -640,6 +642,14 @@ if TASKS_REDIS_USING_SENTINEL:
37
37
'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT
38
38
},
39
39
}
+2
-2
pkgs/servers/web-apps/netbox/default.nix
+2
-2
pkgs/servers/web-apps/netbox/default.nix
···
18
18
in
19
19
py.pkgs.buildPythonApplication rec {
20
20
pname = "netbox";
21
-
version = "3.4.2";
21
+
version = "3.4.3";
22
22
23
23
format = "other";
24
24
···
26
26
owner = "netbox-community";
27
27
repo = pname;
28
28
rev = "refs/tags/v${version}";
29
-
sha256 = "sha256-NMvNI5toPngVVUnxY6+U3Pdj9VGGGXTrB8YIcrQguZE=";
29
+
sha256 = "sha256-M/CbnlnRaWuwcJJofY5mPpVTl9zYrApsXqV9hilNyvw=";
30
30
};
31
31
32
32
patches = [