marrub
/
snipt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removing S3 stuff.

master
Nick Sergeant 2012-03-05 12:57:39 -05:00
parent e44e8fb84d
commit fbd99b9c18
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
requirements.txt
View File

@ -1,19 +1,16 @@
BeautifulSoup BeautifulSoup
biplist biplist
boto
Django Django
django-annoying django-annoying
django-bcrypt django-bcrypt
django-grappelli django-grappelli
django-pagination django-pagination
django-storages
django-taggit django-taggit
django-tastypie django-tastypie
django-templatetag-sugar django-templatetag-sugar
gunicorn gunicorn
johnny-cache johnny-cache
lxml lxml
newrelic
psycopg2 psycopg2
Pygments Pygments
python-memcached python-memcached

14
settings.py
View File

@ -64,22 +64,12 @@ MEDIA_URL = '/media/uploads/'
# in apps' "static/" subdirectories and in STATICFILES_DIRS. # in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/" # Example: "/home/media/media.lawrence.com/static/"
STATIC_ROOT = os.path.join(BASE_PATH, 'static') STATIC_ROOT = os.path.join(BASE_PATH, 'static')
STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage' STATIC_URL = '/static/'
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'
# URL prefix for admin static files -- CSS, JavaScript and images. # URL prefix for admin static files -- CSS, JavaScript and images.
# Make sure to use a trailing slash. # Make sure to use a trailing slash.
# Examples: "http://foo.com/static/admin/", "/static/admin/". # 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 # Additional locations of static files
STATICFILES_DIRS = ( STATICFILES_DIRS = (