Merge branch 'master' into new-dwp-letter-orgs

This commit is contained in:
Pete Herlihy
2017-12-06 13:37:39 +00:00
committed by GitHub
2 changed files with 4 additions and 5 deletions

View File

@@ -392,19 +392,19 @@ class Staging(Config):
FROM_NUMBER = 'stage'
API_RATE_LIMIT_ENABLED = True
CHECK_PROXY_HEADER = True
REDIS_ENABLED = False
REDIS_ENABLED = True
API_KEY_LIMITS = {
KEY_TYPE_TEAM: {
"limit": 21000,
"limit": 24000,
"interval": 60
},
KEY_TYPE_NORMAL: {
"limit": 21000,
"limit": 24000,
"interval": 60
},
KEY_TYPE_TEST: {
"limit": 21000,
"limit": 24000,
"interval": 60
}
}

View File

@@ -1,7 +1,6 @@
---
inherit: manifest-api-base.yml
command: scripts/run_app_paas.sh gunicorn -c /home/vcap/app/gunicorn_config.py --error-logfile /home/vcap/logs/gunicorn_error.log -w 6 -b 0.0.0.0:$PORT application
services:
- notify-aws
- notify-config