[SCM] live-studio branch, master, updated. 541f1b2730aff7ac70fe20cc8be60d95fe44be44

[Chris Lamb]

The following commit has been merged in the master branch:
commit 2b35211cf009b363131bb2f556c386617a5a8584
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Jul 30 01:52:40 2010 -0400

    Stub out the nginx configuration.

diff --git a/config/live-studio-nginx b/config/live-studio-nginx
new file mode 100644
index 0000000..702fd19
--- /dev/null
+++ b/config/live-studio-nginx
@@ -0,0 +1,14 @@
+server {
+	listen			80;
+	server_name		studio.debian.net;
+	root			/usr/share/live-studio/htdocs;
+
+	location / {
+		proxy_pass		http://127.0.0.1:8000;
+		proxy_set_header  	X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header  	X-Forwarded-From-Port $server_port;
+	}
+}
+
+gzip_types			text/html text/css application/x-javascript;
+gzip_disable			"msie6";
diff --git a/debian/control b/debian/control
index b0e7a40..396e38d 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.1
 
 Package: live-studio
 Architecture: all
-Depends: ${misc:Depends}, python-django (>= 1.2), python-psycopg2, python-memcache, python-django-registration
+Depends: ${misc:Depends}, python-django (>= 1.2), python-psycopg2, python-memcache, python-django-registration, nginx
 Description: Debian Live - Web based front-end
  live-studio is a web frontend to the Debian Live tools. It offers users of any
  operating system to customise, build and then download a Debian Live system
diff --git a/debian/live-studio.install b/debian/live-studio.install
index 0dd6672..e2475ac 100644
--- a/debian/live-studio.install
+++ b/debian/live-studio.install
@@ -1,2 +1,3 @@
 usr/
 media /usr/share/live-studio/htdocs
+config/live-studio-nginx /etc/nginx/sites-available
diff --git a/debian/live-studio.postinst b/debian/live-studio.postinst
new file mode 100644
index 0000000..2b5c548
--- /dev/null
+++ b/debian/live-studio.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -eu
+
+rm -f /etc/nginx/sites-enabled/default
+ln -sf ../sites-available/live-studio-nginx /etc/nginx/sites-enabled
+
+invoke-rc.d nginx restart
+
+#DEBHELPER#

-- 
live-studio