diff --git a/django.wsgi b/django.wsgi index a5f9e18851a38315ad9e0f55ebffb2f5a6f1edb9..4adfa98a000e2dc9a29cc756c8c0204ddfff126a 100644 --- a/django.wsgi +++ b/django.wsgi @@ -8,7 +8,7 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' sys.path.append('/home/lars/wsgi-sandbox/lib/python2.6') sys.path.append('/home/lars/wsgi-sandbox/lib/python2.6/site-packages') -sys.path.append('/home/gracedb/gracedb') +sys.path.append('/home/gracedb/graceproj') import django.core.handlers.wsgi application = django.core.handlers.wsgi.WSGIHandler() diff --git a/gracedb/management/commands/make_histograms.py b/gracedb/management/commands/make_histograms.py index cac392970ce0a50aeb9673ab6bbfed142b4350b8..4bd218553762d8646c0f380cfb5c94239c9a2642 100644 --- a/gracedb/management/commands/make_histograms.py +++ b/gracedb/management/commands/make_histograms.py @@ -10,7 +10,7 @@ matplotlib.use("Agg") import matplotlib.pyplot as pyplot import numpy -from gracedb.gracedb.models import Event +from gracedb.models import Event import os from datetime import datetime, timedelta diff --git a/gracedb/management/commands/make_ifar.py b/gracedb/management/commands/make_ifar.py index e753a0500df25364e260c145a3210b56b9861950..5483bbe205954508d404173c7d73c6584fe8aa66 100644 --- a/gracedb/management/commands/make_ifar.py +++ b/gracedb/management/commands/make_ifar.py @@ -2,8 +2,8 @@ from django.core.management.base import BaseCommand, NoArgsCommand from django.conf import settings -from gracedb.gracedb.models import Event -from gracedb.gracedb.query import parseQuery +from gracedb.models import Event +from gracedb.query import parseQuery import os diff --git a/settings/__init__.py b/settings/__init__.py index 2a495ce7b5f0bba677a1b808b1cf521927a0ae50..cd8199ef53f0b8757be74d1c414cb4e627ec0b26 100644 --- a/settings/__init__.py +++ b/settings/__init__.py @@ -24,13 +24,13 @@ configs = { '/home/bmoe/gracedb/gracedb': 'development', '/home/gracedb/gracedb': 'production', + '/home/gracedb/graceproj': 'production', } from default import * -config = configs.get(ROOT_PATH, "NO_CONFIG") -print "FUCKYOU", ROOT_PATH +config = configs.get(ROOT_PATH, "production") settings_module = __import__('%s' % config, globals(), locals(), 'gracedb') diff --git a/settings/default.py b/settings/default.py index ca1548115899023b07d17aa7669f5c3fae54c9f5..36b4baf00cee6afd59def20f3858deb5b776e7a9 100644 --- a/settings/default.py +++ b/settings/default.py @@ -170,7 +170,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/gracedb/gracedb/templates", + "/home/gracedb/graceproj/templates", ) INSTALLED_APPS = (