Merge branch 'devel'

[qcg-portal.git] / plgng / settings_common.py

diff --git a/plgng/settings_common.py b/plgng/settings_common.py
index 337f557..3024c02 100644 (file)
--- a/plgng/settings_common.py
+++ b/plgng/settings_common.py
@@ -33,6 +33,7 @@ INSTALLED_APPS = (
     'django.contrib.webdesign',
     'qcg',
     'filex',
+    'better_sessions',
     'django_openid_auth',
     'bootstrap3',
 )
@@ -45,10 +46,12 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'better_sessions.middleware.BetterSessionsMiddleware',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
     'django.core.context_processors.request',
+    'better_sessions.context_processors.settings',
 )
 
 ROOT_URLCONF = 'plgng.urls'
@@ -107,9 +110,18 @@ OPENID_STRICT_USERNAMES = True
 
 
 SESSION_COOKIE_NAME = 'qcg_session'
-SESSION_COOKIE_AGE = 60 * 60 * 24 * 6  # 6 days, length of user proxy from openid is 1 week
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
 
+# Cache
+
+CACHES = dict(global_settings.CACHES,
+              resources={
+                  'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+                  'LOCATION': '/var/tmp/django_resources_cache',
+                  'TIMEOUT': '3600',
+              })
+
 
 # 3-rd party settings