Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

[unfold.git] / myslice / settings.py

diff --git a/myslice/settings.py b/myslice/settings.py
index 8fd5d9a..89565dd 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -2,6 +2,13 @@
 
 import os.path
 
+### detect if we're in a build environment
+try:
+    import manifold
+    building=False
+except:
+    building=True
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -19,6 +26,18 @@ except:
     import traceback
     traceback.print_exc()
 
+#### this is where the problem lies I believe
+# first try to run manage.py collectstatic without this
+# themes
+theme=None
+try:
+    from myslice.configengine import ConfigEngine
+    configEngine = ConfigEngine()
+    if configEngine.myslice.theme :
+        theme = configEngine.myslice.theme
+except:
+    pass
+    
 # find out HTTPROOT, which is different from ROOT 
 # when deployed from a package
 # this code is run by collectstatic too, so we cannot
@@ -29,7 +48,6 @@ DATAROOT="/var/www/myslice"
 # if not there, then we assume it's from a devel tree
 if not os.path.isdir (os.path.join(HTTPROOT,"static")):
     HTTPROOT=ROOT
-    DATAROOT=ROOT
 
 if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT
 if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT
@@ -183,15 +201,16 @@ ROOT_URLCONF = 'myslice.urls'
 WSGI_APPLICATION = 'unfold.wsgi.application'
 #WSGI_APPLICATION = 'myslice.wsgi.application'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    #os.path.join(HTTPROOT,"templates"),
-    os.path.join(HTTPROOT,"templates"),
-)
+TEMPLATE_DIRS = [ ]
+# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+# Always use forward slashes, even on Windows.
+# Don't forget to use absolute paths, not relative paths.
+if theme is not None:
+    TEMPLATE_DIRS.append ( os.path.join(HTTPROOT,"portal/templates", theme))
+TEMPLATE_DIRS.append     ( os.path.join(HTTPROOT,"portal/templates"))
+TEMPLATE_DIRS.append     (  os.path.join(HTTPROOT,"templates"))
 
-INSTALLED_APPS = [
+INSTALLED_APPS = [ 
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -204,7 +223,9 @@ INSTALLED_APPS = [
     # our django project
     'myslice',
     # the core of the UI
-    'auth', 'manifoldapi', 'unfold',
+    'auth', 
+    'manifoldapi',
+    'unfold',
     # plugins
     'plugins',
     # views - more or less stable 
@@ -216,8 +237,12 @@ INSTALLED_APPS = [
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'portal',
-    'rest',
+    # SLA
+    'sla',
 ]
+# this app won't load in a build environment
+if not building: INSTALLED_APPS.append ('rest')
+
 for aux in auxiliaries:
     if os.path.isdir(os.path.join(ROOT,aux)): 
         print "Using devel auxiliary",aux
@@ -265,3 +290,11 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
 # put stuff under static/
 # IA_MEDIA_PREFIX = '/code/'
+
+SESSION_ENGINE = 'django.contrib.sessions.backends.file'
+
+####SLA#####
+
+SLA_MANAGER_URL = "http://157.193.215.125:4000/sla-service"
+SLA_MANAGER_USER = "normal_user"
+SLA_MANAGER_PASSWORD = "password"