Add unconfirmed registration expiry

[patchwork] / apps / settings.py

diff --git a/apps/settings.py b/apps/settings.py
index 537c38053aa92163e7cc9c1d5b157f5e54eb42ef..4bde26b66a5274b8bd3b5a88f8d4650a6dbbdd04 100644 (file)
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -63,7 +63,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
 )
 
-ROOT_URLCONF = 'apps.urls'
+ROOT_URLCONF = 'urls'
 
 LOGIN_URL = '/user/login/'
 LOGIN_REDIRECT_URL = '/user/'
@@ -114,6 +114,11 @@ ENABLE_XMLRPC = False
 # 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: