Merge branch 'release/1.2.12'

Author: Andrew Welch

Diff for: CHANGELOG.md

@@ -2,7 +2,12 @@
 
 ## 1.2.12 - 2020.10.20
 ### Added
-* Added `--set-gtid-purged=OFF` to the `common_mysql.sh` to avoid permissions issues with some managed database dumps
+* Added `--set-gtid-purged=OFF` to the `common_mysql.sh` to avoid permissions issues with some database dumps
+* Added support for a `LOCAL_AWS_PROFILE` variable, which lets you specify which AWS named profile to connect to S3 with.
+* Add in-folder `.gitignore` to ensure that `.env.sh` is ignored
+
+### Fixed
+* Fix `TMP_LOG_PATH` for local db backups
 
 ## 1.2.11 - 2020.08.11
 ### Changed

Diff for: README.md

@@ -81,6 +81,8 @@ This script assumes that you have already [installed awscli](http://docs.aws.ama
 
 It's recommended that you set up a separate user with access to only S3, and set up a private S3 bucket for your backups.
 
+You can set `LOCAL_AWS_PROFILE` to determine which AWS profile to connect with.
+
 See [Mitigating Disaster via Website Backups](https://nystudio107.com/blog/mitigating-disaster-via-website-backups) for a detailed writeup.
 
 ### backup_db.sh
@@ -218,6 +220,8 @@ All settings that are prefaced with `LOCAL_` refer to the local environment wher
 
 `LOCAL_BACKUPS_PATH` is the absolute path to the directory where local backups should be stored. For database backups, a sub-directory `LOCAL_DB_NAME/db` will be created inside the `LOCAL_BACKUPS_PATH` directory to store the database backups. Paths should always have a trailing `/`
 
+`LOCAL_AWS_PROFILE` is an [AWS named profile](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html) you can set to determine which profile to connect to S3 with. 
+
 ##### Using mysql within a local docker container
 
 `LOCAL_MYSQL_CMD` which is normally just `mysql`, is prepended with `docker exec -i CONTAINER_NAME` to execute the command within the container. (Example: `docker exec -i container_mysql_1 mysql`)

Diff for: scripts/.gitignore

@@ -0,0 +1 @@
+.env.sh

Diff for: scripts/backup_db.sh

@@ -69,7 +69,7 @@ gzip -f "$BACKUP_DB_PATH"
 echo "*** Backed up local database to ${BACKUP_DB_PATH}.gz"
 
 # Remove backups older than LOCAL_BACKUPS_MAX_AGE
-TMP_LOG_PATH="/tmp/${REMOTE_DB_NAME}-db-backups.log"
+TMP_LOG_PATH="/tmp/${LOCAL_DB_NAME}-db-backups.log"
 find "${BACKUP_DB_DIR_PATH}" -name "*.sql.gz" -mtime +${GLOBAL_DB_BACKUPS_MAX_AGE} -exec rm -fv "{}" \; &> $TMP_LOG_PATH
 
 # Report on what we did

Diff for: scripts/sync_backups_to_s3.sh

@@ -34,7 +34,11 @@ echo "Ensuring asset directory exists at '${LOCAL_BACKUPS_PATH}'"
 mkdir -p "${LOCAL_BACKUPS_PATH}"
 
 # Sync the local backups to the Amazon S3 bucket
-aws s3 sync ${LOCAL_BACKUPS_PATH} s3://${REMOTE_S3_BUCKET}/${REMOTE_S3_PATH}
+if [ -z "${LOCAL_AWS_PROFILE}" ] ; then
+    aws s3 sync "${LOCAL_BACKUPS_PATH}" s3://"${REMOTE_S3_BUCKET}"/"${REMOTE_S3_PATH}"
+else
+    aws --profile="${LOCAL_AWS_PROFILE}" s3 sync "${LOCAL_BACKUPS_PATH}" s3://"${REMOTE_S3_BUCKET}"/"${REMOTE_S3_PATH}"
+fi
 echo "*** Synced backups to ${REMOTE_S3_BUCKET}"
 
 # Normal exit