From f08d943f6c3f009f8a1ab2a607eb4d4460a98f12 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 24 Apr 2017 15:42:45 +0200
Subject: [PATCH] Smarter way to load settings from extensions.

see #1109
---
 modoboa/core/commands/templates/settings.py.tpl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl
index 4f3b09009..dcd50d733 100644
--- a/modoboa/core/commands/templates/settings.py.tpl
+++ b/modoboa/core/commands/templates/settings.py.tpl
@@ -252,6 +252,12 @@ LOGGING = {
         }
     }
 }
+
+# Load settings from extensions
 {% for extension in extra_settings %}
-from {{ extension }}.settings import *
+try:
+    from {{ extension }} import settings as {{ extension }}_settings
+    {{ extension }}_settings.apply(globals())
+except AttributeError:
+    from {{ extension }}.settings import *
 {% endfor %}