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
Production version March 2015
[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
..
5c75970
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-2,6
+2,9
@@
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
@@
-42,7
+45,7
@@
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"
# if not there, then we assume it's from a devel tree
# the place to store local data, like e.g. the sqlite db
DATAROOT="/var/unfold"
# if not there, then we assume it's from a devel tree
@@
-233,13
+236,20
@@
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)):
print "Using devel auxiliary",aux
for aux in auxiliaries:
if os.path.isdir(os.path.join(ROOT,aux)):
print "Using devel auxiliary",aux
@@
-276,7
+286,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
+298,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"