X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=0deec5230e63330ed4a25cf46b905e25573cf26b;hb=b709866ba93d98c32127ff4deae5b783e271e5b3;hp=7fc65b81e1db541cb3da12e0097d9af9c86d4ae2;hpb=a222cef0a10a5517349f05cea0e382b35e3a14a6;p=unfold.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 7fc65b81..0deec523 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -9,7 +9,7 @@ TEMPLATE_DEBUG = DEBUG
 
 DEVELOPER_ROOT=os.path.expanduser("~/git/myslice-django")
 
-PRODUCTION_ROOT="/root/myslice"
+PRODUCTION_ROOT="/usr/share/myslice"
 
 ####################
 ADMINS = (
@@ -81,7 +81,7 @@ MEDIA_URL = ''
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = os.path.join(ROOT,'all-static')
+STATIC_ROOT = os.path.join(ROOT,'django-static')
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
@@ -92,7 +92,7 @@ STATICFILES_DIRS = (
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(ROOT,'static'),
+    os.path.join(ROOT,'all-static'),
 )
 
 # List of finder classes that know how to find static files in
@@ -132,7 +132,7 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(ROOT,"templates"),
+    os.path.join(ROOT,"all-templates"),
 )
 
 INSTALLED_APPS = (
@@ -142,13 +142,18 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    # handling the {% insert %} and {% container %} tags
     # see details in devel/django-insert-above-1.0-4
     'insert_above',
+    # our django project
     'myslice',
-    'auth',
-    'engine',
+    # the core of the UI
+    'auth', 'manifold', 'unfold',
+    # plugins
     'plugins',
-    'slice',
+    # views - more or less stable 
+    'views',
+    'trash',
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
@@ -186,7 +191,13 @@ LOGGING = {
 
 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 = 'manifold.manifoldproxy.csrf_failure'
+
 #################### for insert_above
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
 # put stuff under static/
 # IA_MEDIA_PREFIX = '/code/'
+