# HG changeset patch
# User smith@nwoca.org
# Date 1453152506 0
# Node ID 443aa0be3f09a8ddc9da3fa120488a3a9302a0fb
# Parent  d8c2d819e814e7f6504a156b0eab2f61ed3b8c1e
update backup/restore scripts

diff -r d8c2d819e814 -r 443aa0be3f09 scripts/backup-usas.sh
--- a/scripts/backup-usas.sh	Mon Jan 18 15:21:45 2016 -0500
+++ b/scripts/backup-usas.sh	Mon Jan 18 21:28:26 2016 +0000
@@ -1,6 +1,6 @@
 
  docker-compose run --rm usasdb sh -c \
-   "pg_dump -Cc --host=usasdb \
+   "pg_dump -Cc --if-exists --host=usasdb \
       --dbname=\$USASDB_ENV_DB_NAME \
 	  --username=\$USASDB_ENV_DB_USER | gzip \
 	  > /backup/\$USASDB_ENV_DB_NAME.$(date +%Y-%m-%d-%H-%M-%S).backup.gz"
diff -r d8c2d819e814 -r 443aa0be3f09 scripts/backup-usps.sh
--- a/scripts/backup-usps.sh	Mon Jan 18 15:21:45 2016 -0500
+++ b/scripts/backup-usps.sh	Mon Jan 18 21:28:26 2016 +0000
@@ -1,6 +1,6 @@
 
  docker-compose run --rm uspsdb sh -c \
-   "pg_dump -Cc --host=uspsdb \
+   "pg_dump -Cc --if-exists --host=uspsdb \
       --dbname=\$USPSDB_ENV_DB_NAME \
 	  --username=\$USPSDB_ENV_DB_USER | gzip \
 	  > /backup/\$USPSDB_ENV_DB_NAME.$(date +%Y-%m-%d-%H-%M-%S).backup.gz"
diff -r d8c2d819e814 -r 443aa0be3f09 scripts/restore-usas.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/restore-usas.sh	Mon Jan 18 21:28:26 2016 +0000
@@ -0,0 +1,13 @@
+
+if [ -z "$1" ]
+then
+  echo "Usage: `basename $0` {backup file to restore}"
+  echo  " filename must relative to the container's file system. (e.g. /backup/filename)"
+  exit $E_NOARGS
+fi
+
+docker-compose stop usasapp
+docker-compose restart usasdb
+docker-compose run --rm usasdb sh -c \
+   "gunzip -f $1 -c | psql --host=usasdb --username=postgres"
+docker-compose start usasapp
diff -r d8c2d819e814 -r 443aa0be3f09 scripts/restore-usps.sh
--- a/scripts/restore-usps.sh	Mon Jan 18 15:21:45 2016 -0500
+++ b/scripts/restore-usps.sh	Mon Jan 18 21:28:26 2016 +0000
@@ -1,14 +1,14 @@
-
-f [ -z "$1" ]
-then
-  echo "Usage: `basename $0` {backup file to restore}"
-  echo  " filename must relative to the container's file system. (e.g. /backup/filename)"
-  exit $E_NOARGS
-fi
-
-docker-compose stop uspsapp
-docker-compose run --rm uspsdb sh -c \
-   "gunzip -f $1 -c | psql  --host=uspsdb \
-      --dbname=\$USPSDB_ENV_DB_NAME \
-	  --username=\$USPSDB_ENV_DB_USER"
-docker-compose stop uspsapp
+
+if [ -z "$1" ]
+then
+  echo "Usage: `basename $0` {backup file to restore}"
+  echo  " filename must relative to the container's file system. (e.g. /backup/filename)"
+  exit $E_NOARGS
+fi
+
+docker-compose stop uspsapp
+docker-compose restart uspsdb
+docker-compose run --rm uspsdb sh -c \
+   "gunzip -f $1 -c | psql --host=uspsdb --username=postgres"
+docker-compose start uspsapp
+docker-compose stop uspsapp