From 7ace4721d4afcfcd255573665e8758c1cd7e629f Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Mon, 20 Oct 2014 20:27:51 -0400
Subject: [PATCH] Makefile.

---
 Makefile                   |  1 +
 settings.py                | 13 +++++--------
 settings_local.py-template |  6 ++++++
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 settings_local.py-template

diff --git a/Makefile b/Makefile
index 0d3b283..3704bc1 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,7 @@ deploy:
 			> media/js/pro-all.min.js
 
 	@/Users/Nick/.virtualenvs/snipt/bin/python manage.py collectstatic --noinput
+
 	@git push heroku heroku:master
 
 .PHONY: deploy
diff --git a/settings.py b/settings.py
index 5683267..10ec44b 100644
--- a/settings.py
+++ b/settings.py
@@ -86,14 +86,6 @@ USE_I18N = True
 USE_L10N = True
 USE_TZ = True
 
-if not DEBUG:
-    AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID', '')
-    AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY', '')
-    AWS_STORAGE_BUCKET_NAME = os.environ.get('AWS_STORAGE_BUCKET_NAME', '')
-    STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
-    S3_URL = 'https://%s.s3.amazonaws.com/' % AWS_STORAGE_BUCKET_NAME
-    STATIC_URL = S3_URL
-
 INSTALLED_APPS = (
     'gunicorn',
     'raven.contrib.django.raven_compat',
@@ -155,3 +147,8 @@ TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
 )
+
+try:
+    from settings_local import *
+except ImportError:
+    pass
diff --git a/settings_local.py-template b/settings_local.py-template
new file mode 100644
index 0000000..5ef84aa
--- /dev/null
+++ b/settings_local.py-template
@@ -0,0 +1,6 @@
+AWS_ACCESS_KEY_ID = ''
+AWS_SECRET_ACCESS_KEY = ''
+AWS_STORAGE_BUCKET_NAME = ''
+S3_URL = 'https://%s.s3.amazonaws.com/' % AWS_STORAGE_BUCKET_NAME
+STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
+STATIC_URL = S3_URL