X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=f5d11d25e0152110f5f2bf92451acad2f4753317;hb=4f996c198699b90d13181c7ed5c06dc987435df5;hp=86a5b07fd404948f3cb0710032a6f3dfb67d04fc;hpb=ad016322ae3f21b27cda0e942fa48a10c3c728a3;p=unfold.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 86a5b07f..f5d11d25 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -1,5 +1,6 @@
 import os.path
 import logging
+import subprocess
 
 logger = logging.getLogger('myslice')
 
@@ -17,8 +18,6 @@ config = ConfigEngine()
 
 import myslice.components as components
 
-
-
 # import djcelery
 # djcelery.setup_loader()
 
@@ -29,7 +28,11 @@ try:
 except:
     building=True
 
-
+if not config.myslice.portal_version:
+    try:
+        PORTAL_VERSION = subprocess.check_output(["git", "describe"])
+    except:
+        PORTAL_VERSION = 'not using git' 
 
 # DEBUG
 if config.myslice.debug :
@@ -359,7 +362,6 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
 
 ####SLA#####
 
-SLA_MANAGER_URL = "http://157.193.215.125:4001/sla-collector/sla"
-#SLA_MANAGER_URL = "http://172.24.76.28:8000/sla"
-SLA_MANAGER_USER = "portal"
-SLA_MANAGER_PASSWORD = "password"
+SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
+SLA_COLLECTOR_USER = "portal"
+SLA_COLLECTOR_PASSWORD = "password"