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

diff --git a/myslice/settings.py b/myslice/settings.py
index f4d0835b..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,11 +28,16 @@ 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 :
     DEBUG = True
+    INTERNAL_IPS = ("127.0.0.1","132.227.84.195","132.227.78.191","132.227.84.191")
 else :
     DEBUG = False
 
@@ -256,6 +260,7 @@ INSTALLED_APPS = [
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'portal',
+    #'debug_toolbar',
 ]
 # with django-1.7 we leave south and use native migrations
 # managing database migrations
@@ -357,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"