X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=b01b565312c6ac64450341407a5ad4571d6ca997;hb=5df37d96aa758faa548091932a5d00a76aa16551;hp=b36281b14b9506236c5257df94fe66e691123b96;hpb=ca0fa822b04a0e28f0e85f29e476cc7b6ecd70a6;p=myslice.git diff --git a/myslice/settings.py b/myslice/settings.py index b36281b1..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' @@ -365,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"