Gitlab will migrate to a new storage backend starting 0300 UTC on 2020-04-04. We do not anticipate a maintenance window for this migration. Performance may be impacted over the weekend. Thanks for your patience.

Commit 5bc890c3 authored by Branson Stephens's avatar Branson Stephens Committed by Branson Stephens

first changes made by Branson and Brian.

parent 270af007
......@@ -6,9 +6,11 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
# Sandbox libs here, if required.
#
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/graceproj')
#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/branson/sandbox/lib/python2.6')
sys.path.append('/home/branson/sandbox/lib/python2.6/site-packages')
sys.path.append('/home/branson/gracedbdev')
import django.core.handlers.wsgi
application = django.core.handlers.wsgi.WSGIHandler()
......
......@@ -13,7 +13,7 @@ urlpatterns = patterns('gracedb.views',
url (r'^voevent/(?P<graceid>[\w\d]+)', 'voevent', name="voevent"),
url (r'^skyalert/(?P<graceid>[\w\d]+)', 'skyalert', name="skyalert"),
url (r'^(?P<graceid>[\w\d]+)$', 'view', name="view2"),
url (r'^(?P<graceid>[\w\d]+)/files/(?P<filename>.+)$', download, name="file"),
url (r'^(?P<graceid>[\w\d]+)/files/(?P<filename>.*)$', download, name="file"),
url (r'^(?P<graceid>[\w\d]+)/log/(?P<num>([\d]*|preview))$', 'logentry', name="logentry"),
......
......@@ -8,7 +8,7 @@ DATABASES = {
'default' : {
'NAME' : 'branson',
'ENGINE' : 'django.db.backends.mysql',
'USER' : 'gracedb',
'USER' : 'branson',
'PASSWORD' : 'thinglet',
}
}
......@@ -50,5 +50,5 @@ 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.
"/homebransonbmoe/gracedb/templates",
"/home/branson/gracedbdev/templates",
)
......@@ -54,8 +54,9 @@ SKYALERT_DESCRIPTION = "LIGO / Virgo trigger"
SKYALERT_SUBMITTERS = ['Patrick Brady', 'Brian Moe']
GRACEDB_DATA_DIR = "/mnt/gracedb-web/data"
#GRACEDB_DATA_DIR = "/mnt/gracedb-web/data"
#GRACEDB_DATA_DIR = "/mnt/gracedb-web-temp/data"
GRACEDB_DATA_DIR = "/home/branson/fake_data"
# Latency histograms. Where they go and max latency to bin.
LATENCY_REPORT_DEST_DIR = "/home/gracedb/data/latency"
......@@ -131,7 +132,8 @@ MEDIA_URL = '/gracedb-static/'
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
ADMIN_MEDIA_PREFIX = '/media/'
#ADMIN_MEDIA_PREFIX = '/media/'
STATIC_URL = '/media/'
# Make this unique, and don't share it with anybody.
SECRET_KEY = '$$&hl%^_4&s0k7sbdr8ll_^gkz-j8oab0tz$t^^b-%$!83d(av'
......@@ -141,7 +143,7 @@ TEMPLATE_LOADERS = (
#'django.template.loaders.filesystem.load_template_source',
# replaced by...
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.load_template_source',
# 'django.template.loaders.app_directories.load_template_source',
# 'django.template.loaders.eggs.load_template_source',
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment