Merge pull request #46 from udacity/subfolder_fixes

[osqa.git] / settings_local.py.dist

diff --git a/settings_local.py.dist b/settings_local.py.dist
index f48a8e1eb3a83f901663af4f8ac1989dc9d4b98b..e687228a3084c98c9c8ced11f603ad2e9589be6b 100644 (file)
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -51,12 +51,18 @@ DATABASES = {
         'PASSWORD': '',
         'HOST': '',
         'PORT': '',
+        'CONN_MAX_AGE': 600,
     }
 }
 
 CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
 #CACHE_BACKEND = 'dummy://'
 SESSION_ENGINE = 'django.contrib.sessions.backends.db'
+# Customize the values below if OSQA is in a subfolder and especially you're planning on
+# running multiple Django applications (OSQA or others) on the same domain in different
+# subfolders
+#SESSION_COOKIE_PATH = '/'
+#CSRF_COOKIE_PATH = '/'
 
 # This should be equal to your domain name, plus the web application context.
 # This shouldn't be followed by a trailing slash.
@@ -71,7 +77,6 @@ TIME_ZONE = 'America/New_York'
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 
-DJANGO_VERSION = 1.1
 OSQA_DEFAULT_SKIN = 'default'
 
 DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']