From 0eeaf7f24ff053528ea7ee7b8dfd6b415bacc1bb Mon Sep 17 00:00:00 2001
From: Branson Stephens <branson.stephens@ligo.org>
Date: Thu, 14 May 2015 13:52:03 -0500
Subject: [PATCH] Updated Roy's settings to work with new LVAlert situation.
---
settings/fan.py | 125 ------------------------------------------------
settings/roy.py | 2 +
2 files changed, 2 insertions(+), 125 deletions(-)
delete mode 100644 settings/fan.py
diff --git a/settings/fan.py b/settings/fan.py
deleted file mode 100644
index 65612d467..000000000
--- a/settings/fan.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# XXX I know import * is ugly, but I want the stuff from logSettings to be
-# in this namespace.
-
-CONFIG_NAME = "fzhang"
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-DATABASES = {
- 'default' : {
- 'NAME' : 'gracedb',
- 'ENGINE' : 'django.db.backends.mysql',
- 'USER' : 'fzhang',
- 'PASSWORD' : 'zhangfan',
- }
-}
-
-MEDIA_URL = "/gracedb-static/"
-
-GRACEDB_DATA_DIR = "/home/fzhang/gracedb/fake_data"
-
-LOG_ROOT = "/home/fzhang/gracedb/logs"
-
-ALERT_EMAIL_FROM = "Dev Alert <root@moe.phys.uwm.edu>"
-ALERT_EMAIL_TO = [
- "Branson Stephens <branson@gravity.phys.uwm.edu>",
- ]
-ALERT_EMAIL_BCC = ["branson@gravity.phys.uwm.edu"]
-
-ALERT_TEST_EMAIL_FROM = "Dev Test Alert <root@moe.phys.uwm.edu>"
-ALERT_TEST_EMAIL_TO = [
- "Branson Stephens <branson@gravity.phys.uwm.edu>",
- ]
-
-# Don't sent out non-test XMPP alerts on dev box!
-XMPP_ALERT_CHANNELS = [
- 'test_omega',
- 'test_mbtaonline',
- 'test_cwb',
- 'test_lowmass',
- ]
-
-# Latency histograms. Where they go and max latency to bin.
-LATENCY_REPORT_DEST_DIR = "/home/fzhang/gracedb/data/latency"
-LATENCY_REPORT_WEB_PAGE_FILE_PATH = LATENCY_REPORT_DEST_DIR + "/latency.inc"
-
-# Uptime reporting
-UPTIME_REPORT_DIR = "/home/fzhang/gracedb/data/uptime"
-
-
-#SITE_ID = 4
-
-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/fzhang/gracedb/gracedb/templates",
-)
-
-MIDDLEWARE_CLASSES = [
- 'middleware.accept.AcceptMiddleware',
- 'middleware.cli.CliExceptionMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
-# 'django.contrib.auth.middleware.AuthenticationMiddleware',
-# 'ligodjangoauth.LigoShibbolethMiddleware',
- 'ligoauth.middleware.auth.LigoAuthMiddleware',
-# 'maintenancemode.middleware.MaintenanceModeMiddleware',
-# 'debug_toolbar.middleware.DebugToolbarMiddleware',
-]
-
-INSTALLED_APPS = (
- 'django.contrib.auth',
- 'django.contrib.admin',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
-# 'django.contrib.sites',
- 'django.contrib.staticfiles',
- 'gracedb',
- 'userprofile',
- 'ligoauth',
- 'rest_framework',
- 'south',
-# 'debug_toolbar',
-)
-
-INTERNAL_IPS = (
- '129.89.61.55',
-)
-
-LOGGING = {
- 'version': 1,
- 'disable_existing_loggers' : True,
- 'formatters': {
- 'simple': {
- 'format': '%(asctime)s: %(message)s',
- 'datefmt': '%Y-%m-%dT%H:%M:%S',
- },
- },
- 'handlers': {
- 'null': {
- 'level':'DEBUG',
- 'class':'django.utils.log.NullHandler',
- },
- 'performance_file': {
- 'class': 'logging.FileHandler',
- 'formatter': 'simple',
- 'filename': '%s/gracedb_performance.log' % LOG_ROOT,
- },
- },
- 'loggers': {
- 'django': {
- 'handlers': ['null'],
- 'propagate': True,
- 'level': 'INFO',
- },
- 'middleware': {
- 'handlers': ['performance_file'],
- 'propagate': True,
- 'level': 'INFO',
- },
- },
-}
-
diff --git a/settings/roy.py b/settings/roy.py
index 8256d6e6b..0a549f3c5 100644
--- a/settings/roy.py
+++ b/settings/roy.py
@@ -42,6 +42,8 @@ ALERT_TEST_EMAIL_TO = [
]
ALERT_XMPP_SERVER = 'jabber.phys.uwm.edu'
+ALERT_XMPP_SERVERS = ['jabber.phys.uwm.edu',]
+LVALERT_SEND_EXECUTABLE = '/usr/bin/lvalert_send'
EMBB_MAIL_ADDRESS = 'embb@embb-dev.ligo.caltech.edu'
EMBB_SMTP_SERVER = 'acrux.ligo.caltech.edu'
--
GitLab