diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29..1adccb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +26.02.2020 +- пофиксил B2 скприт diff --git a/README.md b/README.md index e2f2095..041ce65 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Backup под для cronjobs -поддерживает бекапирование с: +поддерживает бекапирование баз типа: - postgresql - mongo - mysql diff --git a/assets/usr/local/sbin/backup.sh b/assets/usr/local/sbin/backup.sh index a26593f..88f7b59 100755 --- a/assets/usr/local/sbin/backup.sh +++ b/assets/usr/local/sbin/backup.sh @@ -50,7 +50,7 @@ ARCHIVE="/srv/backup/""$PROJECT_NAME"_`date +%Y-%m-%d-%H-%M`".dump" log "Backuping.." db_backup -log "Copy to ${STORAGE}" +log "Copy to ${STORAGE_TYPE}" storage_upload log "Completed" diff --git a/assets/usr/local/sbin/storage/b2.sh b/assets/usr/local/sbin/storage/b2.sh index 5d11969..957f0de 100644 --- a/assets/usr/local/sbin/storage/b2.sh +++ b/assets/usr/local/sbin/storage/b2.sh @@ -1,28 +1,23 @@ #!/usr/bin/env bash -B2_REMOTE_DIR=${STORAGE_PATH#*/} -B2_BUCKET=${STORAGE_PATH%%/*} - -# Добавляем в конце '/' -if [[ -n "${B2_REMOTE_DIR}" ]] && [[ ${B2_REMOTE_DIR} != */ ]]; then B2_REMOTE_DIR="${B2_REMOTE_DIR}/"; fi - -# Полное имя архива на хранилище -B2_ARCHIVE=${B2_REMOTE_DIR}${ARCHIVE} -B2_ACCOUNT_ID=${ACCOUNT_ID} -B2_APPLICATION_KEY=${APPLICATION_KEY} - -B2_CONNECTION= - -if [[ -n "${DEBUG}" ]]; then - echo B2_BUCKET=${B2_BUCKET} - echo B2_REMOTE_DIR=${B2_REMOTE_DIR} - echo B2_ARCHIVE=${B2_ARCHIVE} -fi - storage_login() { + B2_REMOTE_DIR=${STORAGE_PATH#*/} + B2_BUCKET=${STORAGE_PATH%%/*} + + B2_ARCHIVE=${B2_REMOTE_DIR}/$(basename ${ARCHIVE}) + B2_ACCOUNT_ID=${ACCOUNT_ID} + B2_APPLICATION_KEY=${APPLICATION_KEY} + + if [[ -n "${DEBUG}" ]]; then + echo B2_BUCKET=${B2_BUCKET} + echo B2_REMOTE_DIR=${B2_REMOTE_DIR} + echo B2_ARCHIVE=${B2_ARCHIVE} + echo ARCHIVE=${ARCHIVE} + fi + + B2_CONNECTION= b2 authorize-account ${B2_ACCOUNT_ID} ${B2_APPLICATION_KEY} - log "Login to B2 by ${B2_ACCOUNT_ID}" && \ - export B2_CONNECTION=true + log "Login to B2 by ${B2_ACCOUNT_ID}" && export B2_CONNECTION=true return $? } @@ -30,7 +25,7 @@ storage_login() { storage_download() { [ -z ${B2_CONNECTION} ] && storage_login b2 download-file-by-name ${B2_BUCKET} ${B2_ARCHIVE} ${ARCHIVE} - log "Download \"${B2_ARCHIVE}\" from busket \"${B2_BUCKET}\" \n\t as \"${ARCHIVE}\"" + log "Download in \"${B2_ARCHIVE}\" from bucket \"${B2_BUCKET}\" \n\t as \"$(basename ${ARCHIVE})\"" return $? } @@ -38,7 +33,7 @@ storage_download() { storage_upload() { [ -z ${B2_CONNECTION} ] && storage_login b2 upload-file ${B2_BUCKET} ${ARCHIVE} ${B2_ARCHIVE} - log "Upload \"${ARCHIVE}\" \n\t as \"${B2_ARCHIVE}\" in \"${B2_BUCKET}\"" + log "Upload \"$(basename ${ARCHIVE})\" \n\t to \"${B2_ARCHIVE}\" in bucket \"${B2_BUCKET}\"" return $? }