From 7d9cd58e89afaf1202cea7d5045f2e0339db1a97 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Wed, 10 Apr 2019 15:19:46 +0100 Subject: [PATCH] rename public-api to api we don't use the public-api bit anywhere - even cloudwatch overwrites based on CW_APP_NAME (which we can get rid of as this distinction is gone) --- manifest.yml.j2 | 4 ++-- scripts/paas_app_wrapper.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.yml.j2 b/manifest.yml.j2 index 67bb8bf02..f9a8d77d8 100644 --- a/manifest.yml.j2 +++ b/manifest.yml.j2 @@ -1,11 +1,11 @@ {%- set app_vars = { - 'notify-api': {'NOTIFY_APP_NAME': 'public-api', 'disk_quota': '2G', 'sqlalchemy_pool_size': 20, 'routes': { + 'notify-api': {'NOTIFY_APP_NAME': 'api', 'disk_quota': '2G', 'sqlalchemy_pool_size': 20, 'routes': { 'preview': ['notify-api-preview.cloudapps.digital', 'api.notify.works'], 'staging': ['notify-api-staging.cloudapps.digital', 'api.staging-notify.works'], 'production': ['notify-api-production.cloudapps.digital', 'api.notifications.service.gov.uk'], } }, - 'notify-api-db-migration': {'NOTIFY_APP_NAME': 'public-api', 'instances': 0}, + 'notify-api-db-migration': {'NOTIFY_APP_NAME': 'api', 'instances': 0}, 'notify-delivery-celery-beat': {'NOTIFY_APP_NAME': 'delivery-celery-beat', 'instances': 1, 'memory': '128M'}, 'notify-delivery-worker-database': {'NOTIFY_APP_NAME': 'delivery-worker-database'}, diff --git a/scripts/paas_app_wrapper.sh b/scripts/paas_app_wrapper.sh index 1bc112b0f..96c0bbade 100755 --- a/scripts/paas_app_wrapper.sh +++ b/scripts/paas_app_wrapper.sh @@ -1,6 +1,6 @@ #!/bin/bash case $NOTIFY_APP_NAME in - public-api) + api) unset GUNICORN_CMD_ARGS scripts/run_app_paas.sh gunicorn -c /home/vcap/app/gunicorn_config.py application ;;