settings: define SECURE_PROXY_SSL_HEADER

[panikdb.git] / panikdb / settings.py

diff --git a/panikdb/settings.py b/panikdb/settings.py
index 04223c2f9e2402c2e15fde1df0c654b10aea600d..7f32673eb414967bf10608e84c54a0d18d177633 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/'
 
@@ -100,6 +102,7 @@ TEMPLATES = [
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
+                'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.template.context_processors.debug',
                 'django.template.context_processors.i18n',
@@ -108,6 +111,7 @@ TEMPLATES = [
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',
                 'panikdb.context_processors.internal_ip',
+                'panikdb.context_processors.site_settings',
             ],
         },
     },
@@ -154,13 +158,14 @@ 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',
 )
 
 # A sample logging configuration. The only tangible logging
@@ -257,6 +262,9 @@ TEMPLATE_VARS = {}
 FILE_UPLOAD_DIRECTORY_PERMISSIONS = 0o755
 FILE_UPLOAD_PERMISSIONS = 0o644
 
+ENABLE_TOPIKS = True
+SITE_TITLE = 'PanikDB'
+
 try:
     from .local_settings import *
 except ImportError: