diff --git a/config/settings/container/base.py b/config/settings/container/base.py index 8fad4fa1243fd69ff311be156f09c57dff12a4e1..4765852f5f2a01556862bee12a4684c8d1b2384d 100644 --- a/config/settings/container/base.py +++ b/config/settings/container/base.py @@ -84,6 +84,32 @@ AWS_SES_REGION_ENDPOINT = get_from_env('AWS_SES_REGION_ENDPOINT', AWS_SES_AUTO_THROTTLE = 0.25 ALERT_EMAIL_FROM = get_from_env('DJANGO_ALERT_EMAIL_FROM') +# AWS Elasticache settings: +AWS_ELASTICACHE_ADDR = get_from_env('DJANGO_AWS_ELASTICACHE_ADDR') +CACHES['default'] = { + 'BACKEND': 'django_elasticache.memcached.ElastiCache', + 'LOCATION': AWS_ELASTICACHE_ADDR, + 'OPTIONS' { + 'IGNORE_CLUSTER_ERRORS': [True,False], + }, + } +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', +] + # Priority server settings ---------------------------------------------------- PRIORITY_SERVER = False @@ -112,6 +138,7 @@ DATABASES = { 'PORT': os.environ.get('DJANGO_DB_PORT', ''), 'OPTIONS': { 'init_command': 'SET storage_engine=MyISAM', + 'CONN_MAX_AGE': 3600, # NOTE: for mysql>=5.7 this will need to be changed to #'init_command': 'SET default_storage_engine=MyISAM', }, diff --git a/gracedb/static/css/override.css b/gracedb/static/css/override.css index 643b5f23b7a7dcee3cb3ec21abe95c10df427a79..96bfcbf93351dc0645c103da3f002f8b0ec4e2a9 100644 --- a/gracedb/static/css/override.css +++ b/gracedb/static/css/override.css @@ -11,11 +11,3 @@ border-color: #FFFFFF; } -ul { - list-style-position: outside; -} - -li { -list-style-position: inside; -text-indent: -1em; -} diff --git a/requirements.txt b/requirements.txt index 98331bc6a37a9a69ecd88b175b214ff54346a654..7e3117bdf7d47e6d8c1340deed4050918f13def6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,6 +31,8 @@ packaging==17.1 phonenumbers==8.8.11 python-ldap==3.1.0 python-memcached==1.59 +# Install django-elasticache along with python memcached: +git+git://github.com/gusdan/django-elasticache.git#egg=django-elasticache scipy==1.2.1 sentry-sdk==0.7.10 service_identity==17.0.0