master
Nick Sergeant 2014-10-20 21:48:09 -04:00
parent c3dd4b05aa
commit e32494ca16
3 changed files with 4 additions and 1 deletions

View File

@ -9,6 +9,7 @@ django-debug-toolbar==0.11.0
django-extensions==1.2.5
django-markdown-deux==1.0.4
django-pagination==1.0.7
django-sslify>=0.2
django-storages==1.1.5
django-taggit==0.10
django-tastypie==0.10.0

View File

@ -78,7 +78,7 @@ STATICFILES_FINDERS = ('django.contrib.staticfiles.finders.FileSystemFinder','dj
STATIC_ROOT = os.path.join(BASE_PATH, 'static')
STATIC_URL = 'https://snipt.s3.amazonaws.com/'
TASTYPIE_CANNED_ERROR = "There was an error with your request. The site developers have a record of this error, please email api@snipt.net and we'll help you out."
TEMPLATE_DIRS = (os.path.join(PROJECT_PATH, 'templates'))
TEMPLATE_DIRS = (os.path.join(PROJECT_PATH, 'templates'),)
TEMPLATE_DEBUG = DEBUG
TIME_ZONE = 'America/New_York'
USE_HTTPS = True if 'USE_SSL' in os.environ else False
@ -126,6 +126,7 @@ LOGGING = {
'loggers': {}
}
MIDDLEWARE_CLASSES = (
'sslify.middleware.SSLifyMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',

View File

@ -5,3 +5,4 @@ DEBUG=True
S3_URL = 'https://%s.s3.amazonaws.com/' % AWS_STORAGE_BUCKET_NAME
STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
STATIC_URL = '/static/'
SSLIFY_DISABLE = True