# HG changeset patch
# User aldrich@ssdt-ohio.org
# Date 1588615180 -3600
# Node ID 748b0e2204dcdd8fe1b4c0c9c16022c49c2d89cc
# Parent  dfae5707657d654c4f6fda587376db9cff55f0d3
putting old setup.sh back

diff -r dfae5707657d -r 748b0e2204dc prod/setup.sh
--- a/prod/setup.sh	Fri Feb 07 16:27:11 2020 +0000
+++ b/prod/setup.sh	Mon May 04 18:59:40 2020 +0100
@@ -7,7 +7,7 @@
 #
 # Will create a docker-compose.yml and .env file with default settings.
 #
-#  Updated December 2019 to generate random admin passwords - CatherineAldrich
+# Put back in default on 5/4/2020
 source "$(dirname "${BASH_SOURCE[0]}")/../scripts/.functions.sh"
 
 md5calc() {
@@ -80,14 +80,12 @@
     then    
         echo "  usasdata:" >> ./docker-compose.yml
         [ "$USAS_DB_PASSWORD" == "" ] && echo "USAS_DB_PASSWORD=$(genDBHash)" >> ./.env
-		[ "$USAS_ADMIN_PASSWORD" == "" ] &&  echo "USAS_ADMIN_PASSWORD=$(genDBHash)" >> ./.env
     fi
     
     if [ ! "$usps" == "" ]
     then
       echo "  uspsdata:" >> ./docker-compose.yml
       [ "$USPS_DB_PASSWORD" == "" ] &&  echo "USPS_DB_PASSWORD=$(genDBHash)" >> ./.env
-	  [ "$USPS_ADMIN_PASSWORD" == "" ] &&  echo "USPS_ADMIN_PASSWORD=$(genDBHash)" >> ./.env
     fi
     
     echo "" >> ./docker-compose.yml
@@ -103,30 +101,10 @@
            Move customizations to docker-compose.override.yml then delete the docker-compose.yml
 "
 fi
-##Only creates a docker-compose.override.yml if one does not already exist.
+    
 if [ ! -e "docker-compose.override.yml" ] 
 then 
-   echo 'version: "3.3"' >> docker-compose.override.yml  
-   echo 'services:' >> docker-compose.override.yml   
-##usas admin components
-if [ ! "$usas" == "" ]
-    then
-   echo '  usasapp:' >> docker-compose.override.yml
-   echo '    environment:' >> docker-compose.override.yml
-   echo '      - APPLICATION_ADMIN_PASSWORD=${USAS_ADMIN_PASSWORD}' >> docker-compose.override.yml
-   echo '      - APPLICATION_ADMIN_RESET=true' >> docker-compose.override.yml
-
-fi
-##usps admin components
-if [ ! "$usps" == "" ]
-    then
-   echo '  uspsapp:' >> docker-compose.override.yml
-   echo '    environment:' >> docker-compose.override.yml
-   echo '      - APPLICATION_ADMIN_PASSWORD=${USPS_ADMIN_PASSWORD}' >> docker-compose.override.yml
-   echo '      - APPLICATION_ADMIN_RESET=true' >> docker-compose.override.yml
-
-fi
-##end of entire if statments for docker-compose.override.yml
+   echo 'version: "3.3"' >> docker-compose.override.yml   
 fi
     
 if [ "$USAS_APPLICATIONID" == "" ]