X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=20cdbed8808cf656f8a2baaad97f11cfd987f666;hb=1c8ceaa097622e68c3415d0f59eb55c68acd7f9e;hp=d88a3356778ffb45de8111f39eb2f8a95580cc10;hpb=870308d6f7c55b5f23b82b30713656d629e15e3e;p=unfold.git

diff --git a/myslice/settings.py b/myslice/settings.py
index d88a3356..20cdbed8 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -1,8 +1,17 @@
 # Django settings for myslice project.
 
+import os.path
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
+# change these if you use a different convention
+
+DEVELOPER_ROOT=os.path.expanduser("~/git/myslice-django")
+
+PRODUCTION_ROOT="/root/myslice"
+
+####################
 ADMINS = (
     # ('Your Name', 'your_email@example.com'),
 )
@@ -16,10 +25,13 @@ import os, os.path
 ROOT=''
 def init_root ():
     global ROOT
-    if os.path.exists("/root/myslice"):
-        ROOT="/root/myslice"
+    if os.path.exists(PRODUCTION_ROOT):
+        ROOT=PRODUCTION_ROOT
+    elif os.path.exists (DEVELOPER_ROOT):
+        ROOT=DEVELOPER_ROOT
     else:
-        ROOT=os.path.expanduser("~/git/myslice-django")
+        raise Exception,"Cannot find ROOT for myslice (neither %s nor %s)"%(PRODUCTION_ROOT,DEVELOPER_ROOT)
+
 init_root()
 
 DATABASES = {
@@ -136,7 +148,7 @@ INSTALLED_APPS = (
     'auth',
     'engine',
     'plugins',
-    'slice',
+    'trash',
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
@@ -172,9 +184,15 @@ LOGGING = {
     }
 }
 
-AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', )
+AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', 'auth.manifoldbackend.ManifoldBackend', )
+
+### 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
+# if you need to see the error message then use this setting
+CSRF_FAILURE_VIEW = 'engine.manifoldproxy.csrf_failure'
 
 #################### for insert_above
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
 # put stuff under static/
 # IA_MEDIA_PREFIX = '/code/'
+