X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fsettings.py;h=83aeeb4215a8fc15646cd22434c81635ea57b161;hb=6c119273e873bc2c63ac470e7b975a721b9a6826;hp=df656dec951abc631c0ec3f1740f13d811fb4fca;hpb=eb6db921938c72c0655ca2e381818a471f99f5fa;p=patchwork

diff --git a/apps/settings.py b/apps/settings.py
index df656de..83aeeb4 100644
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -66,7 +66,8 @@ MIDDLEWARE_CLASSES = (
 
 ROOT_URLCONF = 'apps.urls'
 
-LOGIN_URL = '/patchwork/login'
+LOGIN_URL = '/accounts/login'
+LOGIN_REDIRECT_URL = '/user/'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -89,7 +90,23 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'patchwork',
+    'registration',
 )
 
 DEFAULT_PATCHES_PER_PAGE = 100
-PATCHWORK_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
+DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>'
+
+ACCOUNT_ACTIVATION_DAYS = 7
+
+# Set to True to enable the Patchwork XML-RPC interface
+ENABLE_XMLRPC = False
+
+try:
+    from local_settings import *
+except ImportError, ex:
+    import sys
+    sys.stderr.write(\
+            ("settings.py: error importing local settings file:\n" + \
+            "\t%s\n" + \
+            "Do you have a local_settings.py module?\n") % str(ex))
+    raise