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

[myslice.git] / myslice / settings.py

diff --git a/myslice/settings.py b/myslice/settings.py
index 262ad06..d18ca92 100644 (file)
--- 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
@@ -371,4 +375,5 @@ SLA_COLLECTOR_PASSWORD = "password"
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
-
+# test
+ALLOWED_HOSTS = '*onelab.eu'