From 8080ea752571e406b90a4eb1d9cce479dcdec343 2015-03-04 23:57:26
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2015-03-04 23:57:26
Subject: [PATCH] Restore to real site.

---

diff --git a/www/conservancy/settings.py b/www/conservancy/settings.py
index 010ae728f43ac5d6073c836a360c4d8e84dafef9..06330ae009517019fe8b130b4afc732e3547a03e 100644
--- a/www/conservancy/settings.py
+++ b/www/conservancy/settings.py
@@ -23,10 +23,9 @@ SITE_ID = 2
 ROOT_URLCONF = 'conservancy.urls'
 
 
-# FORCE_CANONICAL_HOSTNAME = "sfconservancy.org"
-FORCE_CANONICAL_HOSTNAME = False
+FORCE_CANONICAL_HOSTNAME = "sfconservancy.org"
 
-ALLOWED_HOSTS = [ 'aspen.sfconservancy.org', 'sfconservancy.org' ]
+ALLOWED_HOSTS = [ 'www.sfconservancy.org', 'aspen.sfconservancy.org', 'sfconservancy.org' ]
 
 REDIRECT_TABLE = {
     'www.sf-conservancy.org': 'sfconservancy.org',