settings: declare usage of combo.apps.assets

[panikweb.git] / panikweb / settings.py

diff --git a/panikweb/settings.py b/panikweb/settings.py
index c80afaec12e071503f34a0c2f687fc58e213cb7b..af241fec9f17a254c0f5f0854f96610fe6595061 100644 (file)
--- a/panikweb/settings.py
+++ b/panikweb/settings.py
@@ -128,6 +128,9 @@ TEMPLATES = [
                 'django.template.context_processors.tz',
                 'panikweb.context_processors.panikweb',
             ],
+            'builtins': [
+                'combo.public.templatetags.combo',
+            ],
         },
     },
 ]
@@ -163,6 +166,7 @@ INSTALLED_APPS = (
     'combo.data',
     'combo.public',
     'combo.profile',
+    'combo.apps.assets',
     'combo.apps.dashboard',
     'combo.apps.search',
     'panikombo',
@@ -238,6 +242,8 @@ LANGUAGE_COOKIE_NAME = 'panikweb_language'
 TEMPLATE_VARS = {}
 
 COMBO_DASHBOARD_ENABLED = False
+COMBO_MAP_TILE_URLTEMPLATE = ''
+COMBO_MAP_ATTRIBUTION = ''
 JSON_CELL_TYPES = {}
 
 RADIO_NAME = 'Radio Panik'
@@ -247,10 +253,11 @@ WEBSITE_BASE_URL = 'http://www.radiopanik.org/'
 COMBO_INITIAL_LOGIN_PAGE_PATH = '/'
 COMBO_WELCOME_PAGE_PATH = None
 
-try:
-    from .local_settings import *
-except ImportError as e:
-    pass
+local_settings_file = os.environ.get(
+    'PANIKWEB_SETTINGS_FILE', os.path.join(os.path.dirname(__file__), 'local_settings.py')
+)
+if os.path.exists(local_settings_file):
+    exec(open(local_settings_file).read())
 
 if DEBUG and DEBUG_TOOLBAR:
     MIDDLEWARE_CLASSES += (