File diff 982289597155 → 6f540a0e3f50
www/conservancy/settings.py
Show inline comments
...
 
@@ -14,12 +14,14 @@
 
# General Public License for more details.
 
#
 
# You should have received a copy of the GNU Affero General Public License
 
# along with this program in a file in the toplevel directory called
 
# "AGPLv3".  If not, see <http://www.gnu.org/licenses/>.
 

	
 
import os.path
 

	
 
from djangocommonsettings import *
 

	
 
SITE_ID = 2
 
ROOT_URLCONF = 'conservancy.urls'
 

	
 

	
...
 
@@ -28,20 +30,17 @@ FORCE_CANONICAL_HOSTNAME = "sfconservancy.org"
 
ALLOWED_HOSTS = [ 'www.sfconservancy.org', 'aspen.sfconservancy.org', 'sfconservancy.org',  u'104.130.70.210' ]
 

	
 
REDIRECT_TABLE = {
 
    'www.sf-conservancy.org': 'sfconservancy.org',
 
}
 

	
 
# 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', )
 
_root_dir = os.path.abspath(os.path.dirname(__file__))
 
TEMPLATE_DIRS = (
 
    os.path.join(_root_dir, 'templates'),
 
    os.path.join(_root_dir, 'static'),
 
)
 
del _root_dir
 

	
 
# try:
 
#     from djangodebug import conservancy_hostname as FORCE_CANONICAL_HOSTNAME
 
# except:
 
#     pass