From 613a018076fe9a36ffc047873635ed2ee65edac8 Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Sun, 26 Sep 2010 20:26:32 -0400 Subject: [PATCH] Migrated some settings to djangocommonsettings so they can easily be overridden. --- www/conservancy/settings.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/www/conservancy/settings.py b/www/conservancy/settings.py index 6acf3b1f..2775c0fd 100644 --- a/www/conservancy/settings.py +++ b/www/conservancy/settings.py @@ -20,15 +20,9 @@ from djangocommonsettings import * SITE_ID = 2 -MEDIA_ROOT = '/var/www/conservancy/static/media/' -MEDIA_URL = 'http://sfconservancy.org/media' ROOT_URLCONF = 'conservancy.urls' FORCE_CANONICAL_HOSTNAME = "sfconservancy.org" -TEMPLATE_DIRS = ( - '/var/www/conservancy/templates', -) - try: from djangodebug import conservancy_hostname as FORCE_CANONICAL_HOSTNAME except: