diff --git a/www/conservancy/settings.py b/www/conservancy/settings.py index 6fab2d6555b4c6893ca3cc5793f6ace28fc0f6d1..010ae728f43ac5d6073c836a360c4d8e84dafef9 100644 --- a/www/conservancy/settings.py +++ b/www/conservancy/settings.py @@ -21,13 +21,28 @@ from djangocommonsettings import * SITE_ID = 2 ROOT_URLCONF = 'conservancy.urls' -FORCE_CANONICAL_HOSTNAME = "sfconservancy.org" + + +# FORCE_CANONICAL_HOSTNAME = "sfconservancy.org" +FORCE_CANONICAL_HOSTNAME = False + +ALLOWED_HOSTS = [ 'aspen.sfconservancy.org', 'sfconservancy.org' ] REDIRECT_TABLE = { 'www.sf-conservancy.org': 'sfconservancy.org', } -try: - from djangodebug import conservancy_hostname as FORCE_CANONICAL_HOSTNAME -except: - pass +# import os +# BASE_DIR = os.path.dirname(os.path.dirname(__file__)) + +# from os.path import join +# TEMPLATE_DIRS = ( +# join(BASE_DIR, 'templates'), +# ) +# NOTE: trailing comma is required to force this to be a tuple +TEMPLATE_DIRS = ( '/var/www/conservancy/templates', '/var/www/conservancy/static', ) + +# try: +# from djangodebug import conservancy_hostname as FORCE_CANONICAL_HOSTNAME +# except: +# pass