From 72fe34289c788fdc113ae032a3a55e3f192c6c4b Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Tue, 19 Jun 2012 16:03:17 -0500
Subject: [PATCH] Changes required to mv gracedb -> graceproj Having
gracedb.gracedb was confusing and awful.
---
django.wsgi | 2 +-
gracedb/management/commands/make_histograms.py | 2 +-
gracedb/management/commands/make_ifar.py | 4 ++--
settings/__init__.py | 4 ++--
settings/default.py | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/django.wsgi b/django.wsgi
index a5f9e1885..4adfa98a0 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 cac392970..4bd218553 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 e753a0500..5483bbe20 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 2a495ce7b..cd8199ef5 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 ca1548115..36b4baf00 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 = (
--
GitLab