Merge branch 'master' of github.com:tpetr/muxlist

tpetr · Jan 20, 2011 · 72c6c40 · 72c6c40
2 parents 203fe90 + 1b3e658
commit 72c6c40
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/etc/nginx/prod_django.conf b/etc/nginx/prod_django.conf
@@ -2,6 +2,8 @@ server {
 	listen 80;
 	server_name muxli.st *.muxli.st;
 
+        client_max_body_size 10m;
+
 	location /static/ {
 		root /home/tpetr/repos/muxlist/;
 		break;

diff --git a/muxlist/mix/views.py b/muxlist/mix/views.py
@@ -35,5 +35,5 @@ def add_song(request, group_name):
     track = Track.objects.get(id=request.REQUEST['id'])
     msg = json.dumps({'type': 'song', 'user': request.user.username, 'artist': track.artist.name, 'title': track.title, 'url': track.get_location().url})
     conn.send(msg, destination='/mix/%s' % group_name)
-    r.lpush('mix_%s' % group_name, json.dumps([track.id, str(track.__unicode__())]))
+    #r.lpush('mix_%s' % group_name, json.dumps([track.id, str(track.__unicode__())]))
     return HttpResponse('ok')
diff --git a/muxlist/music/forms.py b/muxlist/music/forms.py
@@ -34,7 +34,7 @@ def save(self, user):
                 fp.write(chunk)
             fp.close()
 
-            tl = TrackLocation(url="http://cambridge.tpetr.net:8000/media/music/%s.mp3" % mp3_hash)
+            tl = TrackLocation(url="%smusic/%s.mp3" % (settings.MEDIA_URL, mp3_hash))
 
             artist_name, album_name, track_name, year, hash = get_track_data_from_file(filename)
 

diff --git a/muxlist/settings/tpetr.py b/muxlist/settings/tpetr.py
@@ -1,9 +1,9 @@
-__ALL__ = ('DATABASES', 'MEDIA_URL')
+__ALL__ = ('DATABASES', 'MEDIA_URL', 'HOSTNAME')
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'muxlist'
+        'NAME': 'muxlist',
         'USER': 'audbly',
         'PASSWORD': 'BuddyTheCat',
     },