# HG changeset patch
# User aldrich@ssdt-ohio.org
# Date 1588615994 -3600
# Node ID 9735d4fef9c5c07c557b52b9572b773136b76e90
# Parent  44ccc79ca501ac40ebccf5e0cfd8dd6dda5d6871# Parent  6adffe4f0b5dc555d4eebd45c89651ace39f1190
flow: Merged <release> '2.7.0' to <master> ('production').

diff -r 44ccc79ca501 -r 9735d4fef9c5 prod/setup.sh
--- a/prod/setup.sh	Tue Nov 12 16:16:00 2019 +0000
+++ b/prod/setup.sh	Mon May 04 19:13:14 2020 +0100
@@ -7,7 +7,7 @@
 #
 # Will create a docker-compose.yml and .env file with default settings.
 #
-# 
+# Put back in default on 5/4/2020
 source "$(dirname "${BASH_SOURCE[0]}")/../scripts/.functions.sh"
 
 md5calc() {
diff -r 44ccc79ca501 -r 9735d4fef9c5 scripts/remote-backup-existing.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/remote-backup-existing.sh	Mon May 04 19:13:14 2020 +0100
@@ -0,0 +1,62 @@
+#!/bin/bash
+# This is similar to the remote backup script except it uses an existing database backup
+# MCOECN personnel used the basic script and modified it 
+# The current directory is expected to contain a project configured
+# as with SSDT conventions for an application database.
+#
+# The file will also be placed on the specified remote target
+# The format of the output is a compressed pg_dump (sql) format.
+#  Still needs tweaking
+#  
+# testing changes additional
+# This will send both usasdb and uspsdb,
+# along with the top level contents of the project directory
+#Environment variables can be used for REMOTE_BACKUP_TARGET and REMOTE_USERNAME
+remoteTarget=${1:-$REMOTE_BACKUP_TARGET}
+userName=${2:-$REMOTE_USERNAME}
+projectDir=${3:-$PWD}
+
+cd $projectDir
+
+source "${SSDT_SCRIPTS:-$(dirname "${BASH_SOURCE[0]}")}/.functions.sh"
+
+set -o pipefail
+
+project=$(composeGetProject)
+
+#If the project is empty, we want to stop the process because this is being run                                                                                                                      from the wrong directory
+
+if [ "$project" == "" ]; then
+
+   echo "no project available"
+
+   exit 1
+
+fi
+
+echo "project is $project"
+echo "Remote target is $remoteTarget"
+echo "Username is $userName"
+
+
+backupFile1=$(ls ./backup/*usasdb*.backup.gz | tail -n 1)
+backupFile2=$(ls ./backup/*uspsdb*.backup.gz | tail -n 1)
+
+
+#Create remote directory before scp
+host=`echo $userName@$remoteTarget | sed -e 's/:.*//'`
+
+target=`echo $remoteTarget | sed -e 's/.*://'`
+
+
+ssh $host mkdir -p $target/$project
+
+#SCP files
+#
+scp ${backupFile1}  ${backupFile2}  $userName@$remoteTarget/$project
+
+echo " "
+
+echo "completed sending ${backupFile1} and ${backupFile2} to ${remoteTarget}/${project} as user $userName"
+
+