Browse Source

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.
pull/160/head
Wade Barnes 7 years ago
parent
commit
7c275035fd
6 changed files with 11 additions and 1 deletions
  1. +1
    -1
      edivorce/settings/openshift.py
  2. +1
    -0
      openshift/edivorce-django-deploy.dev.param
  3. +1
    -0
      openshift/edivorce-django-deploy.param
  4. +1
    -0
      openshift/edivorce-django-deploy.prod.param
  5. +1
    -0
      openshift/edivorce-django-deploy.test.param
  6. +6
    -0
      openshift/templates/edivorce-django/edivorce-django-deploy.yaml

+ 1
- 1
edivorce/settings/openshift.py View File

@ -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')


+ 1
- 0
openshift/edivorce-django-deploy.dev.param View File

@ -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}


+ 1
- 0
openshift/edivorce-django-deploy.param View File

@ -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}


+ 1
- 0
openshift/edivorce-django-deploy.prod.param View File

@ -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}


+ 1
- 0
openshift/edivorce-django-deploy.test.param View File

@ -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}


+ 6
- 0
openshift/templates/edivorce-django/edivorce-django-deploy.yaml View File

@ -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


Loading…
Cancel
Save