# HG changeset patch
# User smith@nwoca.org
# Date 1504641332 -3600
# Node ID 577d9750fe01f3fad68bffd1908612abe87d794d
# Parent  86b906322d78734bb2e9e1ea231a1ed4a6d31ac0# Parent  5824d74a231a5ab816656e6f26b1918b5fe863f2
flow: Merged <hotfix> 'v1.2.1' to <master> ('production').

diff -r 86b906322d78 -r 577d9750fe01 pilot/setup.sh
--- a/pilot/setup.sh	Fri Aug 18 19:24:19 2017 +0100
+++ b/pilot/setup.sh	Tue Sep 05 20:55:32 2017 +0100
@@ -69,8 +69,10 @@
     echo "services:"            >> ./docker-compose.yml
 
     [ ! "$usas" == "" ] &&  cat $base/usas-services.yml >> ./docker-compose.yml
+    echo "" >> ./docker-compose.yml
 
     [ ! "$usps" == "" ] &&  cat $base/usps-services.yml >> ./docker-compose.yml
+    echo "" >> ./docker-compose.yml
 
     echo "volumes:" >> ./docker-compose.yml
 
@@ -127,5 +129,15 @@
    fi
 fi
 
+if [ "$USAS_APP_HOST" == "" ]
+then
+   echo "USAS_APP_HOST=usasapp-svr"   >> .env
+fi
+
+if [ "$USPS_APP_HOST" == "" ]
+then
+   echo "USPS_APP_HOST=uspsapp-svr"   >> .env
+fi
+
 echo "Review or create a docker-compose.override.yml for custom settings."
 
diff -r 86b906322d78 -r 577d9750fe01 pilot/usas-services.yml
--- a/pilot/usas-services.yml	Fri Aug 18 19:24:19 2017 +0100
+++ b/pilot/usas-services.yml	Tue Sep 05 20:55:32 2017 +0100
@@ -15,17 +15,19 @@
     depends_on:
       - usasdb
     networks:
-      - default
+      default:
+        aliases:
+        - ${USAS_APP_HOST:-usasapp-svr}
     environment:
       - DB_HOST=usasdb
       - DB_NAME=usasdb
       - DB_USER=usas
       - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
-      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTHOST=uspsapp
+      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTHOST=${USPS_APP_HOST:-uspsapp-svr}
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTDNSLOOKUP=true
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOST=0.0.0.0
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOSTDNSLOOKUP=false
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_APPLICATIONID=${USAS_APPLICATIONID:- }
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_APIKEY=${USAS_APIKEY:- }
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_REMOTEAPPLICATIONID=${USPS_APPLICATIONID:- }
-      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_REMOTEAPIKEY=${USPS_APIKEY:- }
+      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_REMOTEAPIKEY=${USPS_APIKEY:- }
\ No newline at end of file
diff -r 86b906322d78 -r 577d9750fe01 pilot/usps-services.yml
--- a/pilot/usps-services.yml	Fri Aug 18 19:24:19 2017 +0100
+++ b/pilot/usps-services.yml	Tue Sep 05 20:55:32 2017 +0100
@@ -15,17 +15,19 @@
     depends_on:
       - uspsdb
     networks:
-      - default
+      default:
+        aliases:
+        - ${USPS_APP_HOST:-uspsapp-svr}
     environment:
       - DB_HOST=uspsdb
       - DB_NAME=uspsdb
       - DB_USER=usps
       - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTHOST=usasapp
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTHOST=${USAS_APP_HOST:-usasapp-svr}
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTDNSLOOKUP=true
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOST=0.0.0.0
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOSTDNSLOOKUP=false
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_APPLICATIONID=${USPS_APPLICATIONID:- }
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_APIKEY=${USPS_APIKEY:- }
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_REMOTEAPPLICATIONID=${USAS_APPLICATIONID:- }
-      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_REMOTEAPIKEY=${USAS_APIKEY:- }
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_REMOTEAPIKEY=${USAS_APIKEY:- }
\ No newline at end of file