X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fsettings.py;h=4bde26b66a5274b8bd3b5a88f8d4650a6dbbdd04;hb=1d46858f7ee46c5f2e052292cf84863b76b06e04;hp=24d376259dff926ecab7ee9ebfca3ef670b7a19b;hpb=85e391e7781464514b9df6e7b6936515c3db6c46;p=patchwork

diff --git a/apps/settings.py b/apps/settings.py
index 24d3762..4bde26b 100644
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -49,8 +49,8 @@ SECRET_KEY = '00000000000000000000000000000000000000000000000000'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
-    'django.template.loaders.app_directories.load_template_source',
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
 #     'django.template.loaders.eggs.load_template_source',
 )
 
@@ -58,13 +58,14 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
 )
 
-ROOT_URLCONF = 'apps.urls'
+ROOT_URLCONF = 'urls'
 
-LOGIN_URL = '/accounts/login'
+LOGIN_URL = '/user/login/'
 LOGIN_REDIRECT_URL = '/user/'
 
 # If you change the ROOT_DIR setting in your local_settings.py, you'll need to
@@ -82,7 +83,7 @@ MEDIA_ROOT = os.path.join(
     ROOT_DIR, 'lib', 'python', 'django', 'contrib', 'admin', 'media')
 
 TEMPLATE_CONTEXT_PROCESSORS = (
-    "django.core.context_processors.auth",
+    "django.contrib.auth.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.core.context_processors.media")
@@ -96,17 +97,28 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'patchwork',
-    'registration',
 )
 
 DEFAULT_PATCHES_PER_PAGE = 100
 DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
 
-ACCOUNT_ACTIVATION_DAYS = 7
+CONFIRMATION_VALIDITY_DAYS = 7
+
+NOTIFICATION_DELAY_MINUTES = 10
+NOTIFICATION_FROM_EMAIL = DEFAULT_FROM_EMAIL
 
 # Set to True to enable the Patchwork XML-RPC interface
 ENABLE_XMLRPC = False
 
+# set to True to enable redirections or URLs from previous versions
+# of patchwork
+COMPAT_REDIR = True
+
+# Set to True to always generate https:// links instead of guessing
+# the scheme based on current access. This is useful if SSL protocol
+# is terminated upstream of the server (e.g. at the load balancer)
+FORCE_HTTPS_LINKS = False
+
 try:
     from local_settings import *
 except ImportError, ex: