From 7c275035fd20a01fda0d517eafcfab517878ec1d Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Mon, 4 Jun 2018 15:18:55 -0700 Subject: [PATCH] EDIVORCE-45 - Add support for configuring the PROXY_BASE_URL Add support for configuring the PROXY_BASE_URL independently of the DEPLOYMENT_TYPE for each deployment environment. --- edivorce/settings/openshift.py | 2 +- openshift/edivorce-django-deploy.dev.param | 1 + openshift/edivorce-django-deploy.param | 1 + openshift/edivorce-django-deploy.prod.param | 1 + openshift/edivorce-django-deploy.test.param | 1 + .../templates/edivorce-django/edivorce-django-deploy.yaml | 6 ++++++ 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/edivorce/settings/openshift.py b/edivorce/settings/openshift.py index 51306d2e..59375833 100644 --- a/edivorce/settings/openshift.py +++ b/edivorce/settings/openshift.py @@ -48,7 +48,7 @@ COMPRESS_OFFLINE = True DEPLOYMENT_TYPE = os.getenv('ENVIRONMENT_TYPE') PROXY_URL_PREFIX = '' -PROXY_BASE_URL = 'https://justice.gov.bc.ca' +PROXY_BASE_URL = os.getenv('PROXY_BASE_URL', 'https://justice.gov.bc.ca') if DEPLOYMENT_TYPE == 'dev': PROXY_URL_PREFIX = os.getenv('PROXY_URL_PREFIX', '/divorce-dev') diff --git a/openshift/edivorce-django-deploy.dev.param b/openshift/edivorce-django-deploy.dev.param index 2591e31c..6a4a7a5a 100644 --- a/openshift/edivorce-django-deploy.dev.param +++ b/openshift/edivorce-django-deploy.dev.param @@ -12,6 +12,7 @@ # IMAGE_NAMESPACE=jag-csb-edivorce-tools TAG_NAME=dev PROXY_URL_PREFIX=/divorce +PROXY_BASE_URL=https://dev.justice.gov.bc.ca BASICAUTH_ENABLED=True # BASICAUTH_USERNAME=divorce # BASICAUTH_PASSWORD=[a-zA-Z0-9]{16} diff --git a/openshift/edivorce-django-deploy.param b/openshift/edivorce-django-deploy.param index 6ac09af3..c5201f23 100644 --- a/openshift/edivorce-django-deploy.param +++ b/openshift/edivorce-django-deploy.param @@ -12,6 +12,7 @@ APP_CONFIG=gunicorn_config.py IMAGE_NAMESPACE=jag-csb-edivorce-tools TAG_NAME=dev # PROXY_URL_PREFIX=/divorce +# PROXY_BASE_URL=https://dev.justice.gov.bc.ca BASICAUTH_ENABLED=False BASICAUTH_USERNAME=divorce BASICAUTH_PASSWORD=[a-zA-Z0-9]{16} diff --git a/openshift/edivorce-django-deploy.prod.param b/openshift/edivorce-django-deploy.prod.param index c0c16a4d..cc9a9b0a 100644 --- a/openshift/edivorce-django-deploy.prod.param +++ b/openshift/edivorce-django-deploy.prod.param @@ -12,6 +12,7 @@ # IMAGE_NAMESPACE=jag-csb-edivorce-tools TAG_NAME=prod # PROXY_URL_PREFIX=/divorce +# PROXY_BASE_URL=https://justice.gov.bc.ca BASICAUTH_ENABLED=False # BASICAUTH_USERNAME=divorce # BASICAUTH_PASSWORD=[a-zA-Z0-9]{16} diff --git a/openshift/edivorce-django-deploy.test.param b/openshift/edivorce-django-deploy.test.param index 5ddeb18a..cd1a2154 100644 --- a/openshift/edivorce-django-deploy.test.param +++ b/openshift/edivorce-django-deploy.test.param @@ -12,6 +12,7 @@ # IMAGE_NAMESPACE=jag-csb-edivorce-tools TAG_NAME=test # PROXY_URL_PREFIX=/divorce +# PROXY_BASE_URL=https://test.justice.gov.bc.ca BASICAUTH_ENABLED=True # BASICAUTH_USERNAME=divorce # BASICAUTH_PASSWORD=[a-zA-Z0-9]{16} diff --git a/openshift/templates/edivorce-django/edivorce-django-deploy.yaml b/openshift/templates/edivorce-django/edivorce-django-deploy.yaml index af28daca..e16ba3e0 100644 --- a/openshift/templates/edivorce-django/edivorce-django-deploy.yaml +++ b/openshift/templates/edivorce-django/edivorce-django-deploy.yaml @@ -94,6 +94,8 @@ objects: value: "${TAG_NAME}" - name: PROXY_URL_PREFIX value: "${PROXY_URL_PREFIX}" + - name: PROXY_BASE_URL + value: "${PROXY_BASE_URL}" - name: PROXY_NETWORK value: "${PROXY_NETWORK}" - name: BASICAUTH_ENABLED @@ -174,6 +176,10 @@ parameters: displayName: Proxy URL Prefix description: The proxy URL prefix (aka Host Path) for the application. For example `/divorce` required: false +- name: PROXY_BASE_URL + displayName: Proxy Base URL + description: The proxy base URL (aka Host URL) for the application. For example `https://justice.gov.bc.ca` + required: false - name: PROXY_NETWORK displayName: Network of upstream proxy (CIDR notation 0.0.0.0/0) required: true