From ba5769f25684125cec81f65f4ef6613c776763bc Mon Sep 17 00:00:00 2001
From: Brian Tiemann <btman@mac.com>
Date: Sun, 13 Apr 2025 18:49:38 -0400
Subject: [PATCH] Merge default STORAGES with setting from configuration.py

---
 netbox/netbox/settings.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index c29b09a9b..996a692e2 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -237,11 +237,10 @@ STORAGES = {
         "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
     },
 }
+STORAGES.update(getattr(configuration, 'STORAGES', {}))
 
 if STORAGE_BACKEND is not None:
     STORAGES['default']['BACKEND'] = STORAGE_BACKEND
-    if STORAGE_CONFIG:
-        STORAGES['default']['OPTIONS'] = STORAGE_CONFIG
 
     # django-storages
     if STORAGE_BACKEND.startswith('storages.'):