darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 09:51:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #838 from alphagov/fix_api_host_name

Browse Source 
Remove explicit api_host_name vars from the envs
This commit is contained in:
Andras Ferencz-Szabo
2017-02-23 11:34:21 +00:00
committed by GitHub
parent 978d99f708 e3cb908c1a
commit d30d0ede1e
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -284,6 +284,7 @@ cf-rollback: ## Rollbacks the app to the previous release
.PHONY: cf-push .PHONY: cf-push
cf-push: cf-push:
$(if ${CF_APP},,$(error Must specify CF_APP))
cf push ${CF_APP} -f ${CF_MANIFEST_FILE} cf push ${CF_APP} -f ${CF_MANIFEST_FILE}
define cf_deploy_with_docker define cf_deploy_with_docker

3
app/config.py
View File

@@ -214,7 +214,6 @@ class Preview(Config):
NOTIFY_EMAIL_DOMAIN = 'notify.works' NOTIFY_EMAIL_DOMAIN = 'notify.works'
NOTIFY_ENVIRONMENT = 'preview' NOTIFY_ENVIRONMENT = 'preview'
CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload' CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload'
API_HOST_NAME = 'http://admin-api.internal'
FROM_NUMBER = 'preview' FROM_NUMBER = 'preview'
@@ -223,7 +222,6 @@ class Staging(Config):
NOTIFY_ENVIRONMENT = 'staging' NOTIFY_ENVIRONMENT = 'staging'
CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload' CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload'
STATSD_ENABLED = True STATSD_ENABLED = True
API_HOST_NAME = 'http://admin-api.internal'
FROM_NUMBER = 'stage' FROM_NUMBER = 'stage'
@@ -232,7 +230,6 @@ class Live(Config):
NOTIFY_ENVIRONMENT = 'live' NOTIFY_ENVIRONMENT = 'live'
CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload' CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
STATSD_ENABLED = True STATSD_ENABLED = True
API_HOST_NAME = 'http://admin-api.internal'
FROM_NUMBER = '40604' FROM_NUMBER = '40604'