Merge branch 'master' of git://git.planet-lab.org/plstackapi

[plstackapi.git] / planetstack / planetstack / settings.py

diff --git a/planetstack/planetstack/settings.py b/planetstack/planetstack/settings.py
index c9c4cf3..215501a 100644 (file)
--- a/planetstack/planetstack/settings.py
+++ b/planetstack/planetstack/settings.py
@@ -81,6 +81,7 @@ STATIC_URL = '/static/'
 
 # Additional locations of static files
 STATICFILES_DIRS = ( "/opt/planetstack/core/static/",
+                     "/opt/planetstack/core/xoslib/static/",
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
@@ -124,6 +125,7 @@ TEMPLATE_DIRS = (
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     "/opt/planetstack/templates",
+    "/opt/planetstack/core/xoslib/templates",    
 )
 
 INSTALLED_APPS = (