settings: add flag to enable/disable soma support

[panikdb.git] / panikdb / settings.py

diff --git a/panikdb/settings.py b/panikdb/settings.py
index 8f3b5971abf6b493e6a731aadbb0419db81239c6..7733e43033820eda99b92830f9b42ebd713e35f1 100644 (file)
--- a/panikdb/settings.py
+++ b/panikdb/settings.py
@@ -72,6 +72,8 @@ STATIC_ROOT = os.path.join(PROJECT_PATH, 'static')
 # Example: "http://example.com/static/", "http://static.example.com/"
 STATIC_URL = '/static/'
 
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+
 CKEDITOR_UPLOAD_PATH = 'uploads/'
 CKEDITOR_UPLOAD_PREFIX = '/media/uploads/'
 
@@ -141,7 +143,6 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'registration',
-    'django_bootstrap_staticfiles',
     'ckeditor',
     'haystack',
     'taggit',
@@ -157,11 +158,11 @@ INSTALLED_APPS = (
     'combo.data',
     'combo.manager',
     'combo.apps.assets',
+    'combo.apps.gallery',
     'combo.apps.maps',
     'combo.apps.notifications',
     'combo.apps.pwa',
     'sorl.thumbnail',
-    'gallery',
     'panikombo',
     'django_select2',
     'xstatic.pkg.select2',
@@ -262,6 +263,7 @@ FILE_UPLOAD_DIRECTORY_PERMISSIONS = 0o755
 FILE_UPLOAD_PERMISSIONS = 0o644
 
 ENABLE_TOPIKS = True
+HAS_SOMA = False
 SITE_TITLE = 'PanikDB'
 
 try: