From 5b4dce759f520572a5b98e030d4bf2ead70cb028 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Mon, 3 Jan 2022 18:49:13 +0100
Subject: [PATCH] Enable global merge in DynaConf
---
CHANGELOG.rst | 5 +++++
aleksis/core/settings.py | 2 ++
2 files changed, 7 insertions(+)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3ae079fd2..ba534ce01 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,11 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
+Changed
+~~~~~~~
+
+* Configuration files are now deep merged by default
+
`2.5`_ – 2022-01-02
-------------------
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 4b49ed50c..6b3e65246 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -14,6 +14,7 @@ IN_PYTEST = "PYTEST_CURRENT_TEST" in os.environ or "TOX_ENV_DIR" in os.environ
ENVVAR_PREFIX_FOR_DYNACONF = "ALEKSIS"
DIRS_FOR_DYNACONF = ["/etc/aleksis"]
+MERGE_ENABLED_FOR_DYNACONF = True
SETTINGS_FILE_FOR_DYNACONF = []
for directory in DIRS_FOR_DYNACONF:
@@ -29,6 +30,7 @@ for directory in DIRS_FOR_DYNACONF:
_settings = LazySettings(
ENVVAR_PREFIX_FOR_DYNACONF=ENVVAR_PREFIX_FOR_DYNACONF,
SETTINGS_FILE_FOR_DYNACONF=SETTINGS_FILE_FOR_DYNACONF,
+ MERGE_ENABLED_FOR_DYNACONF=MERGE_ENABLED_FOR_DYNACONF,
)
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
--
GitLab