X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=ece937db4961b8e4c4f9391dcb28907fc5984346;hb=3528c308c23c63774cccf92e473abed0d85893e0;hp=31432e5c29907887459064f1ef771489f5f81d3c;hpb=65d84452c2b58dd76f97e4c28e5ec401aff890c4;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 31432e5c..ece937db 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 = {
@@ -80,6 +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'),
 )
 
 # List of finder classes that know how to find static files in
@@ -133,6 +146,8 @@ INSTALLED_APPS = (
     'insert_above',
     'myslice',
     'auth',
+    'engine',
+    'plugins',
     'slice',
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
@@ -173,4 +188,5 @@ AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', )
 
 #################### for insert_above
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
-IA_MEDIA_PREFIX = '/code/'
+# put stuff under static/
+# IA_MEDIA_PREFIX = '/code/'