[SCM] live-studio branch, master, updated. f79f8e406eb7a87b264068e37c66486121e85b17

[Chris Lamb]

The following commit has been merged in the master branch:
commit f79f8e406eb7a87b264068e37c66486121e85b17
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Jul 31 23:20:06 2010 -0400

    Move 'media' directory to 'htdocs'.

diff --git a/debian/live-studio.install b/debian/live-studio.install
index 1a56945..1959bfa 100644
--- a/debian/live-studio.install
+++ b/debian/live-studio.install
@@ -1,4 +1,4 @@
 usr/
-media /usr/share/live-studio/htdocs
+htdocs /usr/share/live-studio
 templates /usr/share/live-studio
 config/live-studio-nginx /etc/nginx/sites-available
diff --git a/media/css/stylesheet.css b/htdocs/media/css/stylesheet.css
similarity index 100%
rename from media/css/stylesheet.css
rename to htdocs/media/css/stylesheet.css
diff --git a/media/img/debian-title.png b/htdocs/media/img/debian-title.png
similarity index 100%
rename from media/img/debian-title.png
rename to htdocs/media/img/debian-title.png
diff --git a/media/img/debian.png b/htdocs/media/img/debian.png
similarity index 100%
rename from media/img/debian.png
rename to htdocs/media/img/debian.png
diff --git a/media/img/gnome.png b/htdocs/media/img/gnome.png
similarity index 100%
rename from media/img/gnome.png
rename to htdocs/media/img/gnome.png
diff --git a/media/img/kde.png b/htdocs/media/img/kde.png
similarity index 100%
rename from media/img/kde.png
rename to htdocs/media/img/kde.png
diff --git a/media/img/xfce.png b/htdocs/media/img/xfce.png
similarity index 100%
rename from media/img/xfce.png
rename to htdocs/media/img/xfce.png
diff --git a/live_studio/settings/defaults/dirs.py b/live_studio/settings/defaults/dirs.py
index 0ed8114..0ed8de8 100644
--- a/live_studio/settings/defaults/dirs.py
+++ b/live_studio/settings/defaults/dirs.py
@@ -1,6 +1,6 @@
 TEMPLATE_DIRS = ('/usr/share/live-studio/templates',)
 
-MEDIA_ROOT = '/usr/share/live-studio/media'
+MEDIA_ROOT = '/usr/share/live-studio/htdocs/media'
 
 BUILDS_ROOT = '/var/lib/live-studio'
 BUILDS_URL = '/builds'
diff --git a/live_studio/settings/roles/local.py b/live_studio/settings/roles/local.py
index b4dae97..ed3db03 100644
--- a/live_studio/settings/roles/local.py
+++ b/live_studio/settings/roles/local.py
@@ -6,7 +6,7 @@ DEBUG = True
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
-MEDIA_ROOT = join(_BASE, 'media')
+MEDIA_ROOT = join(_BASE, 'htdocs', 'media')
 BUILDS_ROOT = join(_BASE, 'builds')
 TEMPLATE_DIRS = (join(_BASE, 'templates'),)
 

-- 
live-studio