[SCM] live-studio branch, master, updated. 47bbabbccf60b66a17cf892768e7376a6394dc53

[Chris Lamb]

The following commit has been merged in the master branch:
commit 1e39ecd2f2cce13d5449e1352b204d937a0f1b6a
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Jul 30 15:49:44 2010 -0400

    Serve media from nginx.

diff --git a/config/live-studio-nginx b/config/live-studio-nginx
index d584a68..23125eb 100644
--- a/config/live-studio-nginx
+++ b/config/live-studio-nginx
@@ -3,6 +3,10 @@ server {
 	server_name		studio.debian.net;
 	root			/usr/share/live-studio/htdocs;
 
+	location ~ ^/(?:favicon\.ico$|robots\.txt$|media) {
+		expires 30d;
+	}
+
 	location / {
 		proxy_pass		http://127.0.0.1:8000;
 		proxy_set_header	X-Forwarded-For $proxy_add_x_forwarded_for;

-- 
live-studio