|
|
@@ -10,8 +10,6 @@ commandaction="Backing up"
|
|
|
moduleselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
|
|
|
fn_firstcommand_set
|
|
|
|
|
|
-check.sh
|
|
|
-
|
|
|
# Trap to remove lockfile on quit.
|
|
|
fn_backup_trap() {
|
|
|
echo -e ""
|
|
|
@@ -56,12 +54,14 @@ fn_backup_init() {
|
|
|
backupname="${selfname}-$(date '+%Y-%m-%d-%H%M%S')"
|
|
|
|
|
|
info_distro.sh
|
|
|
- fn_print_dots "Backup starting"
|
|
|
- fn_script_log_info "Backup starting"
|
|
|
- fn_print_ok_nl "Backup starting"
|
|
|
+ fn_print_dots "Starting backup"
|
|
|
+ fn_script_log_info "Starting backup"
|
|
|
if [ ! -d "${backupdir}" ] || [ "${backupcount}" == "0" ]; then
|
|
|
- fn_print_info_nl "There are no previous backups"
|
|
|
+ fn_print_info_nl "Starting backup: No previous backups found"
|
|
|
+ fn_script_log_info "No previous backups found"
|
|
|
else
|
|
|
+ fn_print_info_nl "Starting backup: Previous backups found"
|
|
|
+ fn_script_log_info "Previous backups found"
|
|
|
if [ "${lastbackupdaysago}" == "0" ]; then
|
|
|
daysago="less than 1 day ago"
|
|
|
elif [ "${lastbackupdaysago}" == "1" ]; then
|
|
|
@@ -101,32 +101,6 @@ fn_backup_dir() {
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
-# Migrate Backups from old dir before refactor
|
|
|
-fn_backup_migrate_olddir() {
|
|
|
- # Check if old backup dir is there before the refactor and move the backups
|
|
|
- if [ -d "${rootdir}/backups" ]; then
|
|
|
- if [ "${rootdir}/backups" != "${backupdir}" ]; then
|
|
|
- fn_print_dots "Backup directory is being migrated"
|
|
|
- fn_script_log_info "Backup directory is being migrated"
|
|
|
- fn_script_log_info "${rootdir}/backups > ${backupdir}"
|
|
|
- mv "${rootdir}/backups/"* "${backupdir}" 2> /dev/null
|
|
|
- exitcode=$?
|
|
|
- if [ "${exitcode}" == 0 ]; then
|
|
|
- rmdir "${rootdir}/backups" 2> /dev/null
|
|
|
- exitcode=$?
|
|
|
- fi
|
|
|
- if [ "${exitcode}" != 0 ]; then
|
|
|
- fn_print_error_nl "Backup directory is being migrated"
|
|
|
- fn_script_log_error "Backup directory is being migrated"
|
|
|
- else
|
|
|
-
|
|
|
- fn_print_ok_nl "Backup directory is being migrated"
|
|
|
- fn_script_log_pass "Backup directory is being migrated"
|
|
|
- fi
|
|
|
- fi
|
|
|
- fi
|
|
|
-}
|
|
|
-
|
|
|
fn_backup_create_lockfile() {
|
|
|
# Create lockfile.
|
|
|
date '+%s' > "${lockdir:?}/backup.lock"
|
|
|
@@ -142,7 +116,7 @@ fn_backup_compression() {
|
|
|
fn_print_info "A total of ${rootdirduexbackup} will be compressed."
|
|
|
fn_script_log_info "A total of ${rootdirduexbackup} will be compressed: ${backupdir}/${backupname}.tar.gz"
|
|
|
fn_print_dots "Backup (${rootdirduexbackup}) ${backupname}.tar.gz, in progress..."
|
|
|
- fn_script_log_info "backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress"
|
|
|
+ fn_script_log_info "Backup ${rootdirduexbackup} ${backupname}.tar.gz, in progress"
|
|
|
excludedir=$(fn_backup_relpath)
|
|
|
|
|
|
# Check that excludedir is a valid path.
|
|
|
@@ -187,7 +161,7 @@ fn_backup_prune() {
|
|
|
# Display how many backups will be cleared.
|
|
|
echo -e "* Pruning: ${backupquotadiff} backup(s) has exceeded the ${maxbackups} backups limit"
|
|
|
fn_script_log_info "Pruning: ${backupquotadiff} backup(s) has exceeded the ${maxbackups} backups limit"
|
|
|
- fn_sleep_time
|
|
|
+ fn_sleep_time_1
|
|
|
fn_print_dots "Pruning: Clearing ${backupquotadiff} backup(s)"
|
|
|
fn_script_log_info "Pruning: Clearing ${backupquotadiff} backup(s)"
|
|
|
# Clear backups over quota.
|
|
|
@@ -199,7 +173,7 @@ fn_backup_prune() {
|
|
|
# Display how many backups will be cleared.
|
|
|
echo -e "* Pruning: ${backupsoudatedcount} backup(s) are older than ${maxbackupdays} days."
|
|
|
fn_script_log_info "Pruning: ${backupsoudatedcount} backup(s) older than ${maxbackupdays} days."
|
|
|
- fn_sleep_time
|
|
|
+ fn_sleep_time_1
|
|
|
fn_print_dots "Pruning: Clearing ${backupquotadiff} backup(s)."
|
|
|
fn_script_log_info "Pruning: Clearing ${backupquotadiff} backup(s)"
|
|
|
# Clear backups over quota
|
|
|
@@ -264,12 +238,14 @@ fn_backup_start_server() {
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
-# Run functions.
|
|
|
+fn_print_dots ""
|
|
|
+check.sh
|
|
|
+core_logs.sh
|
|
|
+
|
|
|
fn_backup_check_lockfile
|
|
|
fn_backup_init
|
|
|
fn_backup_stop_server
|
|
|
fn_backup_dir
|
|
|
-fn_backup_migrate_olddir
|
|
|
fn_backup_create_lockfile
|
|
|
fn_backup_compression
|
|
|
fn_backup_prune
|