Feat/s3 (#2)

tamaringoapp · Sep 24, 2020 · e50dae5 · e50dae5
1 parent 49c3d6c
commit e50dae5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/backups.sh b/backups.sh
@@ -14,10 +14,12 @@ cd ${MYBACKUPDIR}
 
 echo "Backup running to $MYBACKUPDIR" >> /var/log/cron.log
 
+echo "Dump users and permisions"  >> /var/log/cron.log
+pg_dumpall --globals-only | aws s3 cp - s3://${S3_BUCKET}/${S3_BUCKET_PREFIX}/globals.dmp
+
 #
 # Loop through each pg database backing it up
 #
-#echo "Databases to backup: ${DBLIST}" >> /var/log/cron.log
 for DB in ${DBLIST}
 do
   FILENAME=${MYBACKUPDIR}/${DUMPPREFIX}_${DB}.${MYDATE}.dmp

diff --git a/start.sh b/start.sh
@@ -67,10 +67,16 @@ export REMOVE_BEFORE=$REMOVE_BEFORE
 export DBLIST=\"$DBLIST\"
 export S3_BUCKET=\"$S3_BUCKET\"
 export S3_BUCKET_PREFIX=\"$S3_BUCKET_PREFIX\"
+ " > /pgenv.sh
+
+if [ "${AWS_ACCESS_KEY_ID}" ] && [ "$AWS_SECRET_ACCESS_KEY" ]; then
+echo "
 export AWS_ACCESS_KEY_ID=\"$AWS_ACCESS_KEY_ID\"
 export AWS_SECRET_ACCESS_KEY=\"$AWS_SECRET_ACCESS_KEY\"
+"
+fi
+
 
- " > /pgenv.sh
 echo "Start script running with these environment options"
 cat /pgenv.sh
 set | grep PG