Release v0.1

EnTeQuAk · Dec 2, 2011 · f724b07 · f724b07
1 parent b91b80e
commit f724b07
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/development_settings.py b/development_settings.py
@@ -7,3 +7,6 @@
         'NAME': 'dev.db'
     }
 }
+
+
+
diff --git a/sm/core/templating.py b/sm/core/templating.py
@@ -12,8 +12,12 @@
 
 
 def url_for(viewname, *args, **kwargs):
-    return urlresolvers.reverse(viewname, args=args or None,
-                                kwargs=kwargs or None)
+    endpoint = urlresolvers.reverse(viewname, args=args or None,
+                                    kwargs=kwargs or None)
+    if viewname == 'static':
+        endpoint = settings.STATIC_URL + endpoint[7:]
+
+    return endpoint
 
 
 def render_template(template_name, context, flash=False):

diff --git a/sm/settings.py b/sm/settings.py
@@ -67,7 +67,7 @@
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/static/'
+STATIC_URL = 'http://social-music.s3.amazonaws.com'
 
 # Additional locations of static files
 STATICFILES_DIRS = (
@@ -87,6 +87,12 @@
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
+STATICFILES_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
+
+AWS_ACCESS_KEY_ID = 'AKIAJICYGPGWBJU77EWQ'
+AWS_SECRET_ACCESS_KEY = '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'
+AWS_STORAGE_BUCKET_NAME = 'social-music'
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 'zsm&qrh5d1m-bqrb=b*kkzx)ysn25@iknc*my0v_gx@by7(%i9'