X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=89565ddb5508da5cd4389c67476e96c0aa9e9e71;hb=refs%2Fheads%2Ffibre;hp=33588d401d7b88aa0877b75f59cad0bce39b4699;hpb=69482802ee8c2bef1323ba7b95ba5e629d11fa91;p=unfold.git diff --git a/myslice/settings.py b/myslice/settings.py index 33588d40..89565ddb 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,21 +26,40 @@ 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/www/myslice" # the place to store local data, like e.g. the sqlite db -DATAROOT="/var/unfold" +DATAROOT="/var/www/myslice" # 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 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 +# dec 2013 - we currently have 2 auxiliary subdirs with various utilities +# that we do not wish to package +# * sandbox is for plugin developers +# * sample is for various test views +# for each of these, if we find a directory of that name under ROOT, it then gets +# inserted in INSTALLED_APPS and its urls get included (see urls.py) +auxiliaries = [ 'sandbox', 'sample', ] + #################### ADMINS = ( # ('your_name', 'your_email@test.com'), @@ -49,6 +75,18 @@ EMAIL_HOST = "localhost" EMAIL_PORT = 25 EMAIL_USE_TLS = False +# use the email for debugging purpose +# turn on debugging: +# python -m smtpd -n -c DebuggingServer localhost:1025 + +#if DEBUG: +# EMAIL_HOST = 'localhost' +# EMAIL_PORT = 1025 +# EMAIL_HOST_USER = '' +# EMAIL_HOST_PASSWORD = '' +# EMAIL_USE_TLS = False +# DEFAULT_FROM_EMAIL = 'testing@example.com' + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. @@ -64,7 +102,7 @@ DATABASES = { # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. # In a Windows environment this must be set to your system time zone. -TIME_ZONE = 'America/Chicago' +TIME_ZONE = 'Europe/Paris' # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html @@ -161,15 +199,18 @@ 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"), -) - -INSTALLED_APPS = ( +#WSGI_APPLICATION = 'myslice.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. +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 = [ 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -182,7 +223,9 @@ INSTALLED_APPS = ( # our django project 'myslice', # the core of the UI - 'auth', 'manifold', 'unfold', + 'auth', + 'manifoldapi', + 'unfold', # plugins 'plugins', # views - more or less stable @@ -190,22 +233,20 @@ INSTALLED_APPS = ( # managing database migrations 'south', # Uncomment the next line to enable the admin: - # 'django.contrib.admin', + 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'portal', - # temporary - not packaged - 'trash', - 'sample', - 'sandbox' -# DEPRECATED # 'django.contrib.formtools', -# DEPRECATED ## 'crispy_forms', -# DEPRECATED # -# DEPRECATED # # User registration -# DEPRECATED # 'django.contrib.auth', -# DEPRECATED # 'django.contrib.sites', -# DEPRECATED # 'registration', -) + # 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 + INSTALLED_APPS.append(aux) ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value. @@ -238,14 +279,22 @@ LOGGING = { } } -AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend', ) +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 # if you need to see the error message then use this setting -CSRF_FAILURE_VIEW = 'manifold.manifoldproxy.csrf_failure' +CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure' #################### for insert_above #IA_JS_FORMAT = "