X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=5c75970b675b04dd9ca9c1af3b5ed8501099bb19;hb=f8bf9fe459d94a73dff2c1f4fdcda88ac5031a95;hp=620ab5ba3ea9df6ffbd545f1018d2e22480c54b1;hpb=66c79c18f86fdef0abfdd077b6e6858324b01b6d;p=unfold.git diff --git a/myslice/settings.py b/myslice/settings.py old mode 100755 new mode 100644 index 620ab5ba..5c75970b --- a/myslice/settings.py +++ b/myslice/settings.py @@ -2,6 +2,9 @@ import os.path +import djcelery +djcelery.setup_loader() + ### 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 -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 @@ -233,13 +236,20 @@ INSTALLED_APPS = [ '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', + # SLA + 'sla', ] # 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 @@ -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 @@ -287,3 +298,10 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure' #IA_JS_FORMAT = "