From 613a018076fe9a36ffc047873635ed2ee65edac8 2010-09-27 00:26:32
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2010-09-27 00:26:32
Subject: [PATCH] Migrated some settings to djangocommonsettings so they can easily be overridden.

---

diff --git a/www/conservancy/settings.py b/www/conservancy/settings.py
index 6acf3b1fe291ea369b664d63edb42ee932fec33e..2775c0fd8d10f29e65d9c137c6b2c2bd90e701c8 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: