# HG changeset patch # User smith@nwoca.org # Date 1504638695 -3600 # Node ID 65ad866531d340a70fdc05c27b89f05ad8a49707 # Parent 2d71e4c24606ef66d92fbe9f3564d52c45713c18 USPSR-2856: create alias for apps in default network to allow integraation to use default network (instead of proxy, or other network) diff -r 2d71e4c24606 -r 65ad866531d3 pilot/setup.sh --- a/pilot/setup.sh Fri Aug 18 19:24:01 2017 +0100 +++ b/pilot/setup.sh Tue Sep 05 20:11:35 2017 +0100 @@ -127,5 +127,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 2d71e4c24606 -r 65ad866531d3 pilot/usas-services.yml --- a/pilot/usas-services.yml Fri Aug 18 19:24:01 2017 +0100 +++ b/pilot/usas-services.yml Tue Sep 05 20:11:35 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 2d71e4c24606 -r 65ad866531d3 pilot/usps-services.yml --- a/pilot/usps-services.yml Fri Aug 18 19:24:01 2017 +0100 +++ b/pilot/usps-services.yml Tue Sep 05 20:11:35 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