git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
filenames without _ (spare my pinkie)
[unfold.git]
/
myslice
/
settings.py
diff --git
a/myslice/settings.py
b/myslice/settings.py
index
7785f04
..
7fc65b8
100644
(file)
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-1,8
+1,17
@@
# Django settings for myslice project.
# Django settings for myslice project.
+import os.path
+
DEBUG = True
TEMPLATE_DEBUG = DEBUG
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'),
)
ADMINS = (
# ('Your Name', 'your_email@example.com'),
)
@@
-16,10
+25,13
@@
import os, os.path
ROOT=''
def init_root ():
global ROOT
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:
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 = {
init_root()
DATABASES = {
@@
-134,6
+146,8
@@
INSTALLED_APPS = (
'insert_above',
'myslice',
'auth',
'insert_above',
'myslice',
'auth',
+ 'engine',
+ 'plugins',
'slice',
# Uncomment the next line to enable the admin:
# 'django.contrib.admin',
'slice',
# Uncomment the next line to enable the admin:
# 'django.contrib.admin',
@@
-170,7
+184,7
@@
LOGGING = {
}
}
}
}
-AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', )
+AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend',
'auth.manifoldbackend.ManifoldBackend',
)
#################### for insert_above
#IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
#################### for insert_above
#IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"