X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fsettings.py;h=081258d85de0f297db342c4b801553fe0c73847f;hb=e36dbad0fb969e7afdd97d3336386327564db5ae;hp=8f091d0c672bdb4e24f2959121e4fa71f0409b38;hpb=c2c6a408c7764fa29389ce160f52776c9308d50a;p=patchwork

diff --git a/apps/settings.py b/apps/settings.py
index 8f091d0..081258d 100644
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -10,12 +10,12 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'postgresql_psycopg2'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = 'patchwork'             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'patchwork',
+    },
+}
 
 # Local time zone for this installation. Choices can be found here:
 # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
@@ -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',
 )
 
@@ -82,7 +82,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")
@@ -103,6 +103,9 @@ DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
 
 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