X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=b01b565312c6ac64450341407a5ad4571d6ca997;hb=5df37d96aa758faa548091932a5d00a76aa16551;hp=04d96e67cd1f29032d4b642b4a7da333fdb3fc99;hpb=ac1664fd610dfd7b681cb5c55ab712274bc6f031;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 04d96e67..b01b5653 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -31,7 +31,8 @@ except:
 
 if not config.myslice.portal_version:
     try:
-        PORTAL_VERSION = subprocess.check_output(["git", "describe"])
+        v = subprocess.check_output(["git", "--git-dir", ROOT + "/.git", "describe"])
+        PORTAL_VERSION = '-'.join(v.split('-')[:-1])
     except:
         PORTAL_VERSION = 'not using git' 
 
@@ -90,6 +91,9 @@ MANAGERS = ADMINS
 #DEFAULT_FROM_EMAIL = "root@theseus.ipv6.lip6.fr"
 #EMAIL_HOST_PASSWORD = "mypassword"
 
+if config.myslice.default_sender:
+    DEFAULT_FROM_EMAIL = config.myslice.default_sender
+
 EMAIL_HOST = "localhost"
 EMAIL_PORT = 25
 EMAIL_USE_TLS = False
@@ -362,7 +366,7 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
 
 ####SLA#####
 
-SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
+SLA_COLLECTOR_URL = "https://157.193.215.125:4001/sla-collector/sla"
 SLA_COLLECTOR_USER = "portal"
 SLA_COLLECTOR_PASSWORD = "password"