diff --git a/config/settings/base.py b/config/settings/base.py index 72ee6f067e395fe1d43d06ec7137a84459ea6598..8873fa67898f090b0d2b98213ac14cf8de4ed20c 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -52,7 +52,7 @@ TEST_RUNNER = 'django.test.runner.DiscoverRunner' # BrokenLinkEmailsMiddleware is enabled ADMINS = [ ("Alexander Pace", "alexander.pace@ligo.org"), -# ("Duncan Meacher", "duncan.meacher@ligo.org"), + ("Duncan Meacher", "duncan.meacher@ligo.org"), ] MANAGERS = ADMINS diff --git a/config/settings/vm/base.py b/config/settings/vm/base.py index 61ea75ecd0c60e1476401f7347bfa3c9ecd74524..8e76c0565552bdf570645f80b10519ca7dbc1369 100644 --- a/config/settings/vm/base.py +++ b/config/settings/vm/base.py @@ -19,6 +19,8 @@ DATABASES = { } } + + # Set up allowed hosts SERVER_FQDN = socket.getfqdn() SERVER_HOSTNAME = INTERNAL_HOSTNAME @@ -38,3 +40,37 @@ EMBB_MAIL_ADDRESS = 'embb@{fqdn}.ligo.org'.format(fqdn=SERVER_FQDN) EMBB_SMTP_SERVER = 'localhost' EMBB_MAIL_ADMINS = [admin[1] for admin in ADMINS] EMBB_IGNORE_ADDRESSES = ['Mailer-Daemon@{fqdn}'.format(fqdn=SERVER_FQDN)] + +MIDDLEWARE = [ + 'core.middleware.maintenance.MaintenanceModeMiddleware', + 'events.middleware.PerformanceMiddleware', + 'core.middleware.accept.AcceptMiddleware', + 'core.middleware.api.ClientVersionMiddleware', + 'core.middleware.api.CliExceptionMiddleware', + 'django.middleware.cache.UpdateCacheMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.cache.FetchFromCacheMiddleware', + 'core.middleware.proxy.XForwardedForMiddleware', + 'user_sessions.middleware.SessionMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'ligoauth.middleware.ShibbolethWebAuthMiddleware', + 'ligoauth.middleware.ControlRoomMiddleware', +] + +# Set caches: +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', + 'LOCATION': 'localhost:11211', + 'TIMEOUT': 60, + 'KEY_PREFIX': 'NULL', + }, + # For API throttles + 'throttles': { + 'BACKEND': 'django.core.cache.backends.db.DatabaseCache', + 'LOCATION': 'api_throttle_cache', # Table name + }, +} + +CACHE_MIDDLEWARE_SECONDS = 5 diff --git a/gracedb/templates/superevents/public_alerts.html b/gracedb/templates/superevents/public_alerts.html index 0bec417d479d74e6215b278b008a816f6ba50076..3727000049632b1eb7e4ca951fcb5a51f67facab 100644 --- a/gracedb/templates/superevents/public_alerts.html +++ b/gracedb/templates/superevents/public_alerts.html @@ -1,4 +1,6 @@ {% extends "base.html" %} +{% load cache %} +{% cache 300 publicalerts %} {% load sanitize_html %} {% load logtags %} {% load static %} @@ -106,4 +108,4 @@ <br /><br /><br /> {% endblock %} - +{% endcache %}