From 4d6419fd184590c3620a7a9a5e70ef3adecb97ee Mon Sep 17 00:00:00 2001 From: Alex Barcelo Date: Mon, 13 Dec 2021 21:49:02 +0100 Subject: [PATCH 1/2] reacting to S3_HOST config envvar by setting the --endpoint-url parameter on AWS CLI --- install/etc/services.available/10-db-backup/run | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install/etc/services.available/10-db-backup/run b/install/etc/services.available/10-db-backup/run index d01075b..493cc47 100755 --- a/install/etc/services.available/10-db-backup/run +++ b/install/etc/services.available/10-db-backup/run @@ -420,7 +420,10 @@ move_backup() { export AWS_ACCESS_KEY_ID=${S3_KEY_ID} export AWS_SECRET_ACCESS_KEY=${S3_KEY_SECRET} export AWS_DEFAULT_REGION=ap-northeast-2 - aws s3 cp ${tmpdir}/${target} s3://${S3_BUCKET}/${S3_PATH}/${target} + + [[ ( -n "${S3_HOST}" ) ]] && PARAM_AWS_ENDPOINT_URL=" --endpoint-url ${S3_PROTOCOL}://${S3_HOST}" + + aws ${PARAM_AWS_ENDPOINT_URL} s3 cp ${tmpdir}/${target} s3://${S3_BUCKET}/${S3_PATH}/${target} rm -rf ${tmpdir}/*.md5 rm -rf ${tmpdir}/"${target}" From 86722a8e8ad0ab8fff34592c3b701db682dd9e23 Mon Sep 17 00:00:00 2001 From: Alex Barcelo Date: Mon, 13 Dec 2021 21:56:45 +0100 Subject: [PATCH 2/2] defining target_time variable in that branch --- install/etc/services.available/10-db-backup/run | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/install/etc/services.available/10-db-backup/run b/install/etc/services.available/10-db-backup/run index d01075b..7bf4ac9 100755 --- a/install/etc/services.available/10-db-backup/run +++ b/install/etc/services.available/10-db-backup/run @@ -438,9 +438,10 @@ print_debug "Backup routines Initialized on $(date)" today=$(date +"%Y%m%d") if [[ $DB_DUMP_BEGIN =~ ^\+(.*)$ ]]; then - waittime=$(( ${BASH_REMATCH[1]} * 60 )) + waittime=$(( ${BASH_REMATCH[1]} * 60 )) + target_time=$(($current_time + $waittime)) else - target_time=$(date --date="${today}${DB_DUMP_BEGIN}" +"%s") + target_time=$(date --date="${today}${DB_DUMP_BEGIN}" +"%s") if [[ "$target_time" < "$current_time" ]]; then target_time=$(($target_time + 24*60*60)) fi