From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 9 Mar 2015 18:53:49 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~58^2^2~3
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=111d0fcb9681bf94ff184fe43bf636b6d672cbff

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

Conflicts:
	portal/joinview.py
	portal/registrationview.py
---

111d0fcb9681bf94ff184fe43bf636b6d672cbff
diff --cc myslice/settings.py
index 5c75970b,10b39533..f9f439e1
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@@ -45,9 -49,13 +49,13 @@@ except
  # when deployed from a package
  # this code is run by collectstatic too, so we cannot
  # assume we have ./static present already
 -HTTPROOT="/var/myslice-f4f"
 +HTTPROOT="/var/www/myslice/"
  # the place to store local data, like e.g. the sqlite db
  DATAROOT="/var/unfold"
+ if not os.path.isdir(DATAROOT):
+     print("WARNING: {} is a non-existing directory".format(DATAROOT))
+     print("consequently we assume development mode and re-route DATAROOT to {}".format(ROOT))
+     DATAROOT=ROOT
  # if not there, then we assume it's from a devel tree
  if not os.path.isdir (os.path.join(HTTPROOT,"static")):
      HTTPROOT=ROOT