X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fsettings.py;h=379fbc5128771a43e6a5ac17adf477604ce9c977;hb=a48f76a2d3a98c21d4b37f19cf84073e77db55c8;hp=537c38053aa92163e7cc9c1d5b157f5e54eb42ef;hpb=5d0140ef04ababd93c45b5126ee1b412bd778da5;p=patchwork

diff --git a/apps/settings.py b/apps/settings.py
index 537c380..379fbc5 100644
--- a/apps/settings.py
+++ b/apps/settings.py
@@ -63,19 +63,17 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
 )
 
-ROOT_URLCONF = 'apps.urls'
+ROOT_URLCONF = 'urls'
 
 LOGIN_URL = '/user/login/'
 LOGIN_REDIRECT_URL = '/user/'
 
-# If you change the ROOT_DIR setting in your local_settings.py, you'll need to
-# re-define the variables that use this (MEDIA_ROOT and TEMPLATE_DIRS) too.
-ROOT_DIR = '/srv/patchwork'
+ROOT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir)
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(ROOT_DIR, 'templates')
+    os.path.join(ROOT_DIR, 'templates'),
 )
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
@@ -88,8 +86,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.i18n",
     "django.core.context_processors.media")
 
-AUTH_PROFILE_MODULE = "patchwork.userprofile"
-
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -114,6 +110,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: