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

[Chris Lamb]

The following commit has been merged in the master branch:
commit 2c5b1a86183f70b3a5648d135dc4b7e46e5a3b04
Author: Chris Lamb <lamby at debian.org>
Date:   Fri Jul 30 15:36:54 2010 -0400

    Fix paths for builds, media and templates in the live role.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/live_studio/settings/defaults/dirs.py b/live_studio/settings/defaults/dirs.py
index 1e0a2ed..0ed8114 100644
--- a/live_studio/settings/defaults/dirs.py
+++ b/live_studio/settings/defaults/dirs.py
@@ -1,14 +1,6 @@
-from os.path import dirname, join, abspath
+TEMPLATE_DIRS = ('/usr/share/live-studio/templates',)
 
-LIVE_STUDIO_BASE = dirname(dirname(dirname(dirname(abspath(__file__)))))
+MEDIA_ROOT = '/usr/share/live-studio/media'
 
-TEMPLATE_DIRS = (
-    join(LIVE_STUDIO_BASE, 'templates'),
-)
-
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = join(LIVE_STUDIO_BASE, 'media')
-
-BUILDS_ROOT = join(LIVE_STUDIO_BASE, 'builds')
+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 cdb4753..c504c7f 100644
--- a/live_studio/settings/roles/local.py
+++ b/live_studio/settings/roles/local.py
@@ -1,3 +1,11 @@
+from os.path import dirname, join, abspath
+
+_BASE = dirname(dirname(dirname(dirname(abspath(__file__)))))
+
 DEBUG = True
 
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+
+MEDIA_ROOT = join(_BASE, 'media')
+BUILDS_ROOT = join(_BASE, 'builds')
+TEMPLATE_DIRS = (join(_BASE, 'templates'),)

-- 
live-studio