Dumps are now timestamped, and restore drops the database before

diff --git a/dev/local/restore_db.sh b/dev/local/restore_db.sh
index 4c1aaf197d56b0cf79198c61399464847e6e9c0c..89fbd139ddbde2ae5bf7b7c870adea905fc7b946 100755 (executable)
--- a/dev/local/restore_db.sh
+++ b/dev/local/restore_db.sh
@@ -11,7 +11,9 @@ if [ ! -z "$MYSQL_ROOT_PASSWORD" ]; then
     gunzip < /srv/backup/mariadb.dump.gz | mysql -h db $MYSQL_DATABASE -uroot -p$MYSQL_ROOT_PASSWORD
 elif [ ! -z "$POSTGRES_PASSWORD" ]; then
     export PGPASSWORD=$POSTGRES_PASSWORD
-    pg_restore -c -hdb -Upostgres -dpostgres  /srv/backup/postgres.dump
+    dropdb -hdb -Upostgres postgres
+    createdb -hdb -Upostgres -T template0 postgres
+    pg_restore -C -c -hdb -Upostgres -dpostgres /srv/backup/postgres_latest.dump
 fi
 
 echo "Restore done!"

diff --git a/prod/local/backup_db.sh b/prod/local/backup_db.sh
index 4fa4811272cde05ac3b7bbe0fe84ab823ebc2904..4a2a5165ed7f5a50e61148284c528bdf60a49c7d 100755 (executable)
--- a/prod/local/backup_db.sh
+++ b/prod/local/backup_db.sh
@@ -9,7 +9,10 @@ if [ ! -z "$MYSQL_PASSWORD" ]; then
     mysqldump $MYSQL_DATABASE -hdb -u$MYSQL_USER | gzip > /srv/backup/mariadb.dump.gz
 elif [ ! -z "$POSTGRES_PASSWORD" ]; then
     export PGPASSWORD=$POSTGRES_PASSWORD
-    pg_dump -Fc -hdb -Upostgres -dpostgres > /srv/backup/postgres.dump
+    now=$(date +"%m_%d_%Y_%H_%M_%S")
+    pg_dump -Fc -hdb -Upostgres -dpostgres > /srv/backup/postgres_$now.dump
+    rm -f /srv/backup/postgres_latest.dump
+    ln -s /srv/backup/postgres_$now.dump /srv/backup/postgres_latest.dump
 fi
 
 echo "Backup done!"