X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=5c2d29cc06a03e83d8ca386006e10a9b24b39072;hb=04ea5e29850e650e370b7815c491f3538b442d9e;hp=df4f6d7c2b31553a9abb1f2aec61b88b32eb44fb;hpb=c381d920d9a359eab2b11cb15e88ab1f4e55a82e;p=myslice.git diff --git a/myslice/settings.py b/myslice/settings.py index df4f6d7c..5c2d29cc 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -1,4 +1,4 @@ -# Django settings for myslice project. +# Django settings for unfold project. import os.path @@ -14,13 +14,33 @@ try: # move one step up ROOT=os.path.realpath(ROOT+'/..') except: + # something is badly wrong here ROOT=None - if DEBUG: - import traceback - traceback.print_exc() - -if not ROOT: - raise Exception,"Cannot find ROOT for myslice" + import traceback + traceback.print_exc() + +# 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" +# 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 + +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 = ( @@ -40,7 +60,7 @@ EMAIL_USE_TLS = False DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': os.path.join(ROOT,'myslice.sqlite3'), # Or path to database file if using sqlite3. + 'NAME': os.path.join(DATAROOT,'unfold.sqlite3'), # Or path to database file if using sqlite3. 'USER': '', # Not used with sqlite3. 'PASSWORD': '', # Not used with sqlite3. 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. @@ -84,11 +104,10 @@ 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,'django-static') +STATIC_ROOT = os.path.join(HTTPROOT,'static') # URL prefix for static files. # Example: "http://media.lawrence.com/static/" -# thierry STATIC_URL = '/all-static/' STATIC_URL = '/static/' # Additional locations of static files @@ -96,16 +115,8 @@ 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. - # thierry os.path.join(ROOT,'all-static'), - ('js', os.path.join(ROOT,'manifold/js')), - ('css', os.path.join(ROOT,'manifold/css')), - ('js', os.path.join(ROOT,'unfold/js')), - ('css', os.path.join(ROOT,'unfold/css')), - ('js', os.path.join(ROOT,'auth/js')), - ('css', os.path.join(ROOT,'auth/css')), - ('img', os.path.join(ROOT,'auth/img')), - ('css', os.path.join(ROOT,'views/css')), - ('img', os.path.join(ROOT,'views/img')), + # Thierry : we do not need to detail the contents + # of our 'apps' since they're mentioned in INSTALLED_APPS ) # Needed by PluginFinder @@ -116,11 +127,12 @@ THIRDPARTY_DIR = os.path.join(ROOT, 'third-party') # List of finder classes that know how to find static files in # various locations. STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', +# Thierry : no need for this one +# 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'unfold.static.PluginFinder', - 'unfold.static.ThirdPartyFinder', -# 'django.contrib.staticfiles.finders.DefaultStorageFinder', + 'unfold.collectstatic.PluginFinder', + 'unfold.collectstatic.ThirdPartyFinder', +### 'django.contrib.staticfiles.finders.DefaultStorageFinder', ) #TEMPLATE_CONTEXT_PROCESSORS = ( @@ -156,16 +168,16 @@ MIDDLEWARE_CLASSES = ( ROOT_URLCONF = 'myslice.urls' # Python dotted path to the WSGI application used by Django's runserver. -WSGI_APPLICATION = 'myslice.wsgi.application' +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(ROOT,"all-templates"), + os.path.join(HTTPROOT,"templates"), ) -INSTALLED_APPS = ( +INSTALLED_APPS = [ 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -182,23 +194,19 @@ INSTALLED_APPS = ( # plugins 'plugins', # views - more or less stable - 'views', - 'trash', - 'south', # managing database migrations + 'ui', + # managing database migrations + 'south', # Uncomment the next line to enable the admin: # 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'portal', - 'sample', -# DEPRECATED # 'django.contrib.formtools', -# DEPRECATED ## 'crispy_forms', -# DEPRECATED # -# DEPRECATED # # User registration -# DEPRECATED # 'django.contrib.auth', -# DEPRECATED # 'django.contrib.sites', -# DEPRECATED # 'registration', -) +] +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. @@ -231,7 +239,7 @@ LOGGING = { } } -AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', 'auth.manifoldbackend.ManifoldBackend', ) +AUTHENTICATION_BACKENDS = ( '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 @@ -242,4 +250,3 @@ CSRF_FAILURE_VIEW = 'manifold.manifoldproxy.csrf_failure' #IA_JS_FORMAT = "