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

[myslice.git] / myslice / settings.py

diff --git a/myslice/settings.py b/myslice/settings.py
index fe71e10..3b1f1f3 100644 (file)
--- 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
@@ -44,7 +47,7 @@ except:
 # assume we have ./static present already
 HTTPROOT="/var/myslice-f4f"
 # the place to store local data, like e.g. the sqlite db
-DATAROOT="/var/unfold"
+DATAROOT="/Users/moray/Sites/upmc/myslice"
 # if not there, then we assume it's from a devel tree
 if not os.path.isdir (os.path.join(HTTPROOT,"static")):
     HTTPROOT=ROOT
@@ -233,6 +236,9 @@ 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',
@@ -242,6 +248,8 @@ INSTALLED_APPS = [
 # 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