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
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[unfold.git]
/
myslice
/
settings.py
diff --git
a/myslice/settings.py
b/myslice/settings.py
old mode 100755
(executable)
new mode 100644
(file)
index
620ab5b
..
f9f439e
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-1,7
+1,12
@@
# Django settings for unfold project.
# Django settings for unfold project.
+from __future__ import print_function
+
import os.path
import os.path
+import djcelery
+djcelery.setup_loader()
+
### detect if we're in a build environment
try:
import manifold
### detect if we're in a build environment
try:
import manifold
@@
-10,7
+15,9
@@
except:
building=True
DEBUG = True
building=True
DEBUG = True
-TEMPLATE_DEBUG = DEBUG
+
+# show the various settings as we go
+DEBUG_SETTINGS = False
# compute ROOT from where this file is installed
# should fit every need including developers
# compute ROOT from where this file is installed
# should fit every need including developers
@@
-42,9
+49,13
@@
except:
# when deployed from a package
# this code is run by collectstatic too, so we cannot
# assume we have ./static present already
# when deployed from a package
# this code is run by collectstatic too, so we cannot
# assume we have ./static present already
-HTTPROOT="/
usr/share/unfold
"
+HTTPROOT="/
var/www/myslice/
"
# the place to store local data, like e.g. the sqlite db
DATAROOT="/var/unfold"
# 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
# if not there, then we assume it's from a devel tree
if not os.path.isdir (os.path.join(HTTPROOT,"static")):
HTTPROOT=ROOT
@@
-52,6
+63,11
@@
if not os.path.isdir (os.path.join(HTTPROOT,"static")):
if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT
if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT
if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT
if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT
+if DEBUG_SETTINGS:
+ print('ROOT', ROOT)
+ print('DATAROOT', DATAROOT)
+ print('HTTPROOT', HTTPROOT)
+
# dec 2013 - we currently have 2 auxiliary subdirs with various utilities
# that we do not wish to package
# * sandbox is for plugin developers
# dec 2013 - we currently have 2 auxiliary subdirs with various utilities
# that we do not wish to package
# * sandbox is for plugin developers
@@
-98,6
+114,9
@@
DATABASES = {
}
}
}
}
+if DEBUG_SETTINGS:
+ print('DATABASE NAME',DATABASES['default']['NAME'])
+
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
@@
-233,16
+252,23
@@
INSTALLED_APPS = [
'south',
# Uncomment the next line to enable the admin:
'django.contrib.admin',
'south',
# Uncomment the next line to enable the admin:
'django.contrib.admin',
+ # FORGE Plugin app
+ 'djcelery',
+ 'forge',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'portal',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'portal',
+ # SLA
+ 'sla',
]
# this app won't load in a build environment
if not building: INSTALLED_APPS.append ('rest')
]
# this app won't load in a build environment
if not building: INSTALLED_APPS.append ('rest')
+BROKER_URL = "amqp://myslice:myslice@localhost:5672/myslice"
+
for aux in auxiliaries:
if os.path.isdir(os.path.join(ROOT,aux)):
for aux in auxiliaries:
if os.path.isdir(os.path.join(ROOT,aux)):
- print
"Using devel auxiliary",aux
+ print
("Using devel auxiliary",aux)
INSTALLED_APPS.append(aux)
ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value.
INSTALLED_APPS.append(aux)
ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value.
@@
-276,7
+302,8
@@
LOGGING = {
}
}
}
}
-AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend','django.contrib.auth.backends.ModelBackend' )
+AUTHENTICATION_BACKENDS = ('auth.manifoldbackend.ManifoldBackend',
+ 'django.contrib.auth.backends.ModelBackend')
### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
# without this setting django will return a 403 forbidden error, which is fine
### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
# without this setting django will return a 403 forbidden error, which is fine
@@
-287,3
+314,10
@@
CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure'
#IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
# put stuff under static/
# IA_MEDIA_PREFIX = '/code/'
#IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
# put stuff under static/
# IA_MEDIA_PREFIX = '/code/'
+
+####SLA#####
+
+SLA_MANAGER_URL = "http://157.193.215.125:4001/sla-collector/sla"
+#SLA_MANAGER_URL = "http://172.24.76.28:8000/sla"
+SLA_MANAGER_USER = "portal"
+SLA_MANAGER_PASSWORD = "password"