Merge pull request #2 from WadeBarnes/master

Add support for configuring the PROXY_URL_PREFIX independently

edivorce/settings/openshift.py

@@ -51,16 +51,16 @@ PROXY_URL_PREFIX = ''
 PROXY_BASE_URL = 'https://justice.gov.bc.ca'
 
 if DEPLOYMENT_TYPE == 'dev':
-    PROXY_URL_PREFIX = "/divorce-dev"
+    PROXY_URL_PREFIX = os.getenv('PROXY_URL_PREFIX', '/divorce-dev')
     DEBUG = True
     REGISTER_URL = 'https://www.test.bceid.ca/directories/bluepages/details.aspx?serviceID=5522'
 
 if DEPLOYMENT_TYPE == 'test':
-    PROXY_URL_PREFIX = "/divorce-test"
+    PROXY_URL_PREFIX = os.getenv('PROXY_URL_PREFIX', '/divorce-test')
     REGISTER_URL = 'https://www.test.bceid.ca/directories/bluepages/details.aspx?serviceID=5521'
 
 if DEPLOYMENT_TYPE == 'prod':
-    PROXY_URL_PREFIX = "/divorce"
+    PROXY_URL_PREFIX = os.getenv('PROXY_URL_PREFIX', '/divorce')
     REGISTER_URL = 'https://www.bceid.ca/directories/bluepages/details.aspx?serviceID=5203'
     # Google Tag Manager (Production)
     GTM_ID = 'GTM-W4Z2SPS'

openshift/edivorce-django-deploy.dev.param

@@ -11,6 +11,7 @@
 # #DJANGO_SECRET_KEY=[\w]{50}
 # IMAGE_NAMESPACE=jag-csb-edivorce-tools
 TAG_NAME=dev
+PROXY_URL_PREFIX=/divorce
 BASICAUTH_ENABLED=True
 # BASICAUTH_USERNAME=divorce
 # BASICAUTH_PASSWORD=[a-zA-Z0-9]{16}

openshift/edivorce-django-deploy.param

@@ -11,6 +11,7 @@ APP_CONFIG=gunicorn_config.py
 # DJANGO_SECRET_KEY=[\w]{50}
 IMAGE_NAMESPACE=jag-csb-edivorce-tools
 TAG_NAME=dev
+# PROXY_URL_PREFIX=/divorce
 BASICAUTH_ENABLED=False
 BASICAUTH_USERNAME=divorce
 BASICAUTH_PASSWORD=[a-zA-Z0-9]{16}

openshift/edivorce-django-deploy.prod.param

@@ -11,6 +11,7 @@
 # #DJANGO_SECRET_KEY=[\w]{50}
 # IMAGE_NAMESPACE=jag-csb-edivorce-tools
 TAG_NAME=prod
+# PROXY_URL_PREFIX=/divorce
 BASICAUTH_ENABLED=False
 # BASICAUTH_USERNAME=divorce
 # BASICAUTH_PASSWORD=[a-zA-Z0-9]{16}

openshift/edivorce-django-deploy.test.param

@@ -11,6 +11,7 @@
 # #DJANGO_SECRET_KEY=[\w]{50}
 # IMAGE_NAMESPACE=jag-csb-edivorce-tools
 TAG_NAME=test
+# PROXY_URL_PREFIX=/divorce
 BASICAUTH_ENABLED=True
 # BASICAUTH_USERNAME=divorce
 # BASICAUTH_PASSWORD=[a-zA-Z0-9]{16}

openshift/templates/edivorce-django/edivorce-django-deploy.yaml

@@ -92,6 +92,8 @@ objects:
             value: "${DJANGO_SECRET_KEY}"
           - name: ENVIRONMENT_TYPE
             value: "${TAG_NAME}"
+          - name: PROXY_URL_PREFIX
+            value: "${PROXY_URL_PREFIX}"
           - name: PROXY_NETWORK
             value: "${PROXY_NETWORK}"
           - name: BASICAUTH_ENABLED
@@ -168,6 +170,10 @@ parameters:
   description: The TAG name for this environment, e.g., dev, test, prod, or minishift.
   required: true
   value: dev
+- name: PROXY_URL_PREFIX
+  displayName: Proxy URL Prefix
+  description: The proxy URL prefix (aka Host Path) for the application.  For example `/divorce`
+  required: false
 - name: PROXY_NETWORK
   displayName: Network of upstream proxy (CIDR notation 0.0.0.0/0)
   required: true