summaryrefslogtreecommitdiffstats
path: root/askbot/setup_templates
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-07-16 00:13:11 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-07-16 00:13:11 -0400
commit04c514c03bb957126db1d34b7e5a5b4755deb50c (patch)
treefb4438eda1b2a0b5c6122286e0151abbee158bf7 /askbot/setup_templates
parentf3feb51bea6f6d94ba0d66b8493682fbe0cb0558 (diff)
parent19a94dccc7c337a72c8c28ae2d90860f6f2a7fbe (diff)
downloadaskbot-04c514c03bb957126db1d34b7e5a5b4755deb50c.tar.gz
askbot-04c514c03bb957126db1d34b7e5a5b4755deb50c.tar.bz2
askbot-04c514c03bb957126db1d34b7e5a5b4755deb50c.zip
Merge branch 'livesettings_fix'
Diffstat (limited to 'askbot/setup_templates')
-rw-r--r--askbot/setup_templates/settings.py3
-rw-r--r--askbot/setup_templates/settings.py.mustache2
2 files changed, 5 insertions, 0 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index 32af9920..632c4e70 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -181,6 +181,8 @@ INSTALLED_APPS = (
CACHE_BACKEND = 'locmem://'
#needed for django-keyedcache
CACHE_TIMEOUT = 6000
+#sets a special timeout for livesettings if you want to make them different
+LIVESETTINGS_CACHE_TIMEOUT = CACHE_TIMEOUT
CACHE_PREFIX = 'askbot' #make this unique
CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
#If you use memcache you may want to uncomment the following line to enable memcached based sessions
@@ -229,3 +231,4 @@ CSRF_COOKIE_NAME = 'askbot_csrf'
STATICFILES_DIRS = ( os.path.join(ASKBOT_ROOT, 'skins'),)
RECAPTCHA_USE_SSL = True
+
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index 3c3daaa2..18ac214d 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -180,6 +180,8 @@ INSTALLED_APPS = (
CACHE_BACKEND = 'locmem://'
#needed for django-keyedcache
CACHE_TIMEOUT = 6000
+#sets a special timeout for livesettings if you want to make them different
+LIVESETTINGS_CACHE_TIMEOUT = CACHE_TIMEOUT
CACHE_PREFIX = 'askbot' #make this unique
CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
#If you use memcache you may want to uncomment the following line to enable memcached based sessions