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

[myslice.git] / myslice / settings.py

diff --git a/myslice/settings.py b/myslice/settings.py
index 83d0dc4..89565dd 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -42,13 +42,12 @@ except:
 # when deployed from a package
 # this code is run by collectstatic too, so we cannot
 # assume we have ./static present already
-HTTPROOT="/usr/share/unfold"
+HTTPROOT="/var/www/myslice"
 # the place to store local data, like e.g. the sqlite db
-DATAROOT="/var/unfold"
+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
@@ -200,6 +199,7 @@ ROOT_URLCONF = 'myslice.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 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".
@@ -237,6 +237,8 @@ INSTALLED_APPS = [
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'portal',
+    # SLA
+    'sla',
 ]
 # this app won't load in a build environment
 if not building: INSTALLED_APPS.append ('rest')
@@ -288,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"