git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
portal_version without hash
[unfold.git]
/
myslice
/
settings.py
diff --git
a/myslice/settings.py
b/myslice/settings.py
index
04d96e6
..
b01b565
100644
(file)
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-31,7
+31,8
@@
except:
if not config.myslice.portal_version:
try:
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'
except:
PORTAL_VERSION = 'not using git'
@@
-90,6
+91,9
@@
MANAGERS = ADMINS
#DEFAULT_FROM_EMAIL = "root@theseus.ipv6.lip6.fr"
#EMAIL_HOST_PASSWORD = "mypassword"
#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
EMAIL_HOST = "localhost"
EMAIL_PORT = 25
EMAIL_USE_TLS = False
@@
-362,7
+366,7
@@
CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
####SLA#####
####SLA#####
-SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla"
+SLA_COLLECTOR_URL = "http
s
://157.193.215.125:4001/sla-collector/sla"
SLA_COLLECTOR_USER = "portal"
SLA_COLLECTOR_PASSWORD = "password"
SLA_COLLECTOR_USER = "portal"
SLA_COLLECTOR_PASSWORD = "password"