From e23d5c0680546c5f02336916b2a2a1de01cb05f2 Mon Sep 17 00:00:00 2001 From: Brian Moe <bmoe@moe.phys.uwm.edu> Date: Mon, 5 Dec 2011 11:29:35 -0600 Subject: [PATCH] new settings for new debian squeeze server --- django-dev.wsgi | 16 +++++----------- settings_dev.py | 4 ++-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/django-dev.wsgi b/django-dev.wsgi index dc709020a..4b462e19b 100644 --- a/django-dev.wsgi +++ b/django-dev.wsgi @@ -1,21 +1,15 @@ import os import sys -sys.path.append('/home/lars/django') - -# OK, the lib/lib64 situation should be handled better. - -sys.path.append('/opt/lscsoft-bleed/lib64/python2.4/site-packages') -sys.path.append('/opt/lscsoft-bleed/glue/lib64/python2.4/site-packages') -sys.path.append('/opt/lscsoft-bleed/lib/python2.4/site-packages') - -sys.path.append('/opt/lscsoft/pylal/lib/python2.4/site-packages') -sys.path.append('/opt/lscsoft/pylal/lib64/python2.4/site-packages') +# XXX The WSGI files should be unified. +# Would be easy if settings.py were unified, which isn't hard. os.environ['DJANGO_SETTINGS_MODULE'] = 'gracedb.settings_dev' +sys.path.append('/home/bmoe/sandbox/lib/python2.6/site-packages') +sys.path.append('/home/bmoe/sandbox/lib/python2.6') + import django.core.handlers.wsgi application = django.core.handlers.wsgi.WSGIHandler() -#os.environ['PKG_CONFIG_PATH'] = "${HOME}/lib/pkgconfig:${PKG_CONFIG_PATH}" diff --git a/settings_dev.py b/settings_dev.py index c4e2a02ac..173628c70 100644 --- a/settings_dev.py +++ b/settings_dev.py @@ -36,7 +36,7 @@ DATABASE_HOST = '' # Set to empty string for localhost. DATABASE_PORT = '' # Set to empty string for default. # Latency histograms. Where they go and max latency to bin. -LATENCY_REPORT_DEST_DIR = "/home/lars/django/data/latency" +LATENCY_REPORT_DEST_DIR = "/home/bmoe/django/data/latency" LATENCY_MAXIMUM_CHARTED = 1800 LATENCY_REPORT_WEB_PAGE_FILE_PATH = LATENCY_REPORT_DEST_DIR + "/latency.inc" @@ -112,7 +112,7 @@ 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. - "/home/lars/django/gracedb/templates", + "/home/bmoe/gracedb/templates", ) INSTALLED_APPS = ( -- GitLab