Merge pull request #239 from istresearch/rel/v4.0.12.12

ensure temba.local_settings is imported last.
istresearch · Mar 17, 2022 · 0074ab6 · 0074ab6
2 parents ff2938b + 83f9f97
commit 0074ab6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.0.12.11
+4.0.12.12
diff --git a/docker/customizations/engage/temba/settings.py b/docker/customizations/engage/temba/settings.py
@@ -41,3 +41,9 @@
     'version': version_str,
 })
 BRANDING[DEFAULT_BRAND] = DEFAULT_BRAND_OBJ
+
+# in case an instance defines/overrides any previous setting
+try:
+    from temba.local_settings import *
+except ImportError:
+    pass
diff --git a/docker/customizations/generic/temba/settings.py b/docker/customizations/generic/temba/settings.py
@@ -46,3 +46,9 @@
     'version': version_str,
 })
 BRANDING[DEFAULT_BRAND] = DEFAULT_BRAND_OBJ
+
+# in case an instance defines/overrides any previous setting
+try:
+    from temba.local_settings import *
+except ImportError:
+    pass
diff --git a/docker/customizations/rp/temba/settings.py b/docker/customizations/rp/temba/settings.py
@@ -3,3 +3,9 @@
 
 DEFAULT_BRAND = "rapidpro.io"
 BRANDING[DEFAULT_BRAND] = DEFAULT_BRAND_OBJ
+
+# in case an instance defines/overrides any previous setting
+try:
+    from temba.local_settings import *
+except ImportError:
+    pass