X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=5faef7f864662d6da3bedf4661237e80424fdb45;hb=f7308899def626ccdb7218a2fc504bf50cd5cafc;hp=30887d6c81dd9b6841e2aee1d17236610b2e4076;hpb=6143e0e624058757d3479f26bdcc62d923848613;p=unfold.git diff --git a/myslice/settings.py b/myslice/settings.py index 30887d6c..5faef7f8 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -2,6 +2,13 @@ import os.path +### detect if we're in a build environment +try: + import manifold + building=False +except: + building=True + DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -19,19 +26,28 @@ except: import traceback traceback.print_exc() +#### this is where the problem lies I believe +# first try to run manage.py collectstatic without this +# themes +theme=None +try: + from myslice.configengine import ConfigEngine + configEngine = ConfigEngine() + if configEngine.myslice.theme : + theme = configEngine.myslice.theme +except: + pass + # find out HTTPROOT, which is different from ROOT # when deployed from a package # this code is run by collectstatic too, so we cannot # assume we have ./static present already -HTTPROOT="/usr/share/unfold" +HTTPROOT="/var/myslice-f4f" # the place to store local data, like e.g. the sqlite db DATAROOT="/var/unfold" # if not there, then we assume it's from a devel tree if not os.path.isdir (os.path.join(HTTPROOT,"static")): HTTPROOT=ROOT - DATAROOT=ROOT - -print "HTTPROOT = ",HTTPROOT if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT @@ -184,14 +200,16 @@ ROOT_URLCONF = 'myslice.urls' # Python dotted path to the WSGI application used by Django's runserver. WSGI_APPLICATION = 'unfold.wsgi.application' -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(HTTPROOT,"templates"), -) +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. +if theme is not None: + TEMPLATE_DIRS.append ( os.path.join(HTTPROOT,"portal/templates", theme)) +TEMPLATE_DIRS.append ( os.path.join(HTTPROOT,"portal/templates")) +TEMPLATE_DIRS.append ( os.path.join(HTTPROOT,"templates")) -INSTALLED_APPS = [ +INSTALLED_APPS = [ 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -204,7 +222,9 @@ INSTALLED_APPS = [ # our django project 'myslice', # the core of the UI - 'auth', 'manifoldapi', 'unfold', + 'auth', + 'manifoldapi', + 'unfold', # plugins 'plugins', # views - more or less stable @@ -216,8 +236,12 @@ INSTALLED_APPS = [ # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'portal', - 'rest', + # SLA + 'sla', ] +# this app won't load in a build environment +if not building: INSTALLED_APPS.append ('rest') + for aux in auxiliaries: if os.path.isdir(os.path.join(ROOT,aux)): print "Using devel auxiliary",aux @@ -254,7 +278,8 @@ LOGGING = { } } -AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend','django.contrib.auth.backends.ModelBackend' ) +AUTHENTICATION_BACKENDS = ('auth.manifoldbackend.ManifoldBackend', + 'django.contrib.auth.backends.ModelBackend') ### 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 @@ -265,3 +290,9 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure' #IA_JS_FORMAT = "