diff --git a/CHANGELOG.md b/CHANGELOG.md index 1adccb4..3eade96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,5 @@ +27.03.2020 +- добавил везде gzip сжатие + 26.02.2020 -- пофиксил B2 скприт +- пофиксил B2 скрипт diff --git a/assets/usr/local/sbin/backup.sh b/assets/usr/local/sbin/backup.sh index 88f7b59..934d27b 100755 --- a/assets/usr/local/sbin/backup.sh +++ b/assets/usr/local/sbin/backup.sh @@ -11,17 +11,22 @@ for ENV in "${ENVS[@]}"; do fi done +EXT_DB="" + case $DBTYPE in mysql) log "DB type is " + EXT_DB="sql.gz" source lib/mysql.sh ;; postgresql|psql|postgres) log "DB type is " + EXT_DB="dump.gz" source lib/postgresql.sh ;; mongo|mongod|mongodb) log "DB type is " + EXT_DB="dump.tgz" source lib/mongo.sh ;; *) @@ -45,13 +50,15 @@ case $STORAGE_TYPE in ;; esac -ARCHIVE="/srv/backup/""$PROJECT_NAME"_`date +%Y-%m-%d-%H-%M`".dump" +TIME=`date +%Y-%m-%d-%H-%M` +ARCHIVE="/srv/backup/""$PROJECT_NAME"_$TIME".$EXT_DB" -log "Backuping.." +log "Backuping db.." db_backup -log "Copy to ${STORAGE_TYPE}" +log "Copy $ARCHIVE to ${STORAGE_TYPE}" storage_upload +rm $ARCHIVE log "Completed" diff --git a/assets/usr/local/sbin/lib/mysql.sh b/assets/usr/local/sbin/lib/mysql.sh index 60fb25c..5b5701c 100644 --- a/assets/usr/local/sbin/lib/mysql.sh +++ b/assets/usr/local/sbin/lib/mysql.sh @@ -28,7 +28,7 @@ db_drop() { db_backup() { [[ -z "${DB_CONNECTION}" ]] && db_connect - mysqldump --routines ${DB_CONNECTION} > ${ARCHIVE} + mysqldump --routines ${DB_CONNECTION} | gzip > ${ARCHIVE} } db_restore() { @@ -47,4 +47,4 @@ db_isExist() { [[ -z "${DB_CONNECTION}" ]] && db_connect false -} \ No newline at end of file +} diff --git a/assets/usr/local/sbin/lib/postgresql.sh b/assets/usr/local/sbin/lib/postgresql.sh index 2dbeb66..765b27c 100644 --- a/assets/usr/local/sbin/lib/postgresql.sh +++ b/assets/usr/local/sbin/lib/postgresql.sh @@ -37,7 +37,7 @@ db_isExist() { db_backup() { [[ -z "${DB_CONNECTION}" ]] && db_connect - pg_dump -F c -O -b ${DB_CONNECTION} -f ${ARCHIVE} + pg_dump -F c -O -b ${DB_CONNECTION} | gzip > ${ARCHIVE} } db_restore() {