From a70a3dad79d3d5ffbc0f212896d9bc410db7ca48 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Mon, 20 Oct 2014 22:39:16 -0400 Subject: [PATCH] Fucking hell. --- settings.py | 7 ------- urls.py | 7 +++---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/settings.py b/settings.py index a3d3079..c25d9fe 100644 --- a/settings.py +++ b/settings.py @@ -85,13 +85,6 @@ USE_I18N = True USE_L10N = True USE_TZ = True -if 'USE_SSL' in os.environ: - BASE_DIR = os.path.dirname(os.path.abspath(__file__)) - STATIC_ROOT = 'staticfiles' - STATICFILES_DIRS = ( - os.path.join(BASE_DIR, 'media'), - ) - INSTALLED_APPS = ( 'gunicorn', 'raven.contrib.django.raven_compat', diff --git a/urls.py b/urls.py index d5e75e3..b8dd4cb 100644 --- a/urls.py +++ b/urls.py @@ -68,7 +68,6 @@ urlpatterns = patterns('', url(r'^', include('snipts.urls')), ) -if 'USE_SSL' not in os.environ: - urlpatterns += patterns('', - (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.dirname(__file__), 'media')}), - ) +urlpatterns += patterns('', + (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.dirname(__file__), 'media')}), +)