From fbd99b9c187087f0f209ecd88cf30e2e51346475 Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Mon, 5 Mar 2012 12:57:39 -0500
Subject: [PATCH] Removing S3 stuff.

---
 requirements.txt |  3 ---
 settings.py      | 14 ++------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b9d675a..3ba666f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,16 @@
 BeautifulSoup
 biplist
-boto
 Django
 django-annoying
 django-bcrypt
 django-grappelli
 django-pagination
-django-storages
 django-taggit
 django-tastypie
 django-templatetag-sugar
 gunicorn
 johnny-cache
 lxml
-newrelic
 psycopg2
 Pygments
 python-memcached
diff --git a/settings.py b/settings.py
index ab5c3ac..cc8e69f 100644
--- a/settings.py
+++ b/settings.py
@@ -64,22 +64,12 @@ MEDIA_URL = '/media/uploads/'
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = os.path.join(BASE_PATH, 'static')
-STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
-if DEBUG:
-    STATIC_URL = '/media/'
-else:
-    STATIC_URL = 'https://snipt.s3.amazonaws.com/'
-HEROKU_STATIC_URL = os.path.join(BASE_PATH, 'media')
-
-# S3 Settings
-AWS_ACCESS_KEY_ID = 'AKIAJTFDHBCXHJLXINKQ'
-AWS_SECRET_ACCESS_KEY = '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'
-AWS_STORAGE_BUCKET_NAME = 'snipt'
+STATIC_URL = '/static/'
 
 # URL prefix for admin static files -- CSS, JavaScript and images.
 # Make sure to use a trailing slash.
 # Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = 'https://snipt.s3.amazonaws.com/grappelli/'
+ADMIN_MEDIA_PREFIX = '/static/grappelli/'
 
 # Additional locations of static files
 STATICFILES_DIRS = (