Release 4.1.21 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 4.1.21 2025-08-08 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for 4.1.20 release inadvertently failing backups (credit tlex@github)
+
+
+## 4.1.20 2025-07-23 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix backup error checking routines #417 - credit alteriks@github
+
+
+## 4.1.19 2025-05-28 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Force overwrite manual scripts as opposed to append (#414)
+
+
 ## 4.1.18 2025-05-12 <dave at tiredofit dot ca>
 
    ### Changed

install/assets/functions/10-db-backup

@@ -737,7 +737,7 @@ backup_mysql() {
                 write_log notice "Dumping MySQL/MariaDB database: '${db}' ${compression_string}"
                 if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi
                 run_as_user ${play_fair} ${_mysql_prefix}${_mysql_bin_prefix}dump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} $db | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
-                exit_code=$?
+                exit_code=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2]))
                 if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi
                 check_exit_code backup "${backup_job_filename}"
                 timer backup finish
@@ -758,7 +758,7 @@ backup_mysql() {
         write_log notice "Dumping all MySQL / MariaDB databases: '$(echo ${db_names} | xargs | tr ' ' ',')' ${compression_string}"
         if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi
         run_as_user ${play_fair} ${_mysql_prefix}${_mysql_bin_prefix}dump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} --databases $(echo ${db_names} | xargs) | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
-        exit_code=$?
+                exit_code=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2]))
         if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi
         check_exit_code backup "${backup_job_filename}"
         timer backup finish
@@ -781,7 +781,7 @@ backup_pgsql() {
         print_notice "Dumping PostgresSQL globals: with 'pg_dumpall -g' ${compression_string}"
         if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi
         run_as_user ${play_fair} pg_dumpall -h "${backup_job_db_host}" -U "${backup_job_db_user}" -p "${backup_job_db_port}" -g ${backup_job_extra_opts} ${backup_job_extra_backup_opts} | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
-        exit_code=$?
+                exit_code=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2]))
         if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi
         check_exit_code "${backup_job_filename}"
         timer backup finish
@@ -830,7 +830,7 @@ backup_pgsql() {
                 write_log notice "Dumping PostgresSQL database: '${db}' ${compression_string}"
                 if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi
                 run_as_user ${play_fair} pg_dump -h "${backup_job_db_host}" -p "${backup_job_db_port}" -U "${backup_job_db_user}" $db ${backup_job_extra_opts} ${backup_job_extra_backup_opts} | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
-                exit_code=$?
+                exit_code=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2]))
                 if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi
                 check_exit_code backup "${backup_job_filename}"
                 timer backup finish
@@ -864,7 +864,7 @@ backup_pgsql() {
             pgexclude_arg=$(echo ${pgexclude_arg} --exclude-database=${x_db_name})
         done
         run_as_user ${play_fair} pg_dumpall -h ${backup_job_db_host} -p ${backup_job_db_port} -U ${backup_job_db_user} ${pgexclude_arg} ${backup_job_extra_opts} ${backup_job_extra_backup_opts} | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null
-        exit_code=$?
+                exit_code=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2]))
         if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi
         check_exit_code backup "${backup_job_filename}"
         timer backup finish
@@ -1247,7 +1247,7 @@ create_schedulers() {
             cp -R /assets/dbbackup/template-dbbackup /etc/services.available/dbbackup-"${instance}"
             sed -i "s|{{BACKUP_NUMBER}}|${instance}|g" /etc/services.available/dbbackup-"${instance}"/run
             if [ "${MODE,,}" = "manual" ] ; then service_stop dbbackup-"${instance}" ; fi
-            cat <<EOF >> /usr/bin/backup"${instance}"-now
+            cat <<EOF > /usr/bin/backup"${instance}"-now
 #!/bin/bash
 source /assets/functions/00-container
 PROCESS_NAME=db-backup${instance}
@@ -1267,7 +1267,7 @@ EOF
 
 EOF
             else
-                echo "/usr/bin/backup${instance}-now now" >> /usr/bin/backup-now
+                echo "/usr/bin/backup${instance}-now now" > /usr/bin/backup-now
             fi
 
             instance=$(echo "${instance} +1" | bc)
@@ -1860,7 +1860,7 @@ setup_mode() {
             cat <<EOF > /etc/services.d/99-run_forever/run
 #!/bin/bash
 while true; do
-	sleep 86400
+    sleep 86400
 done
 EOF
             chmod +x /etc/services.d/99-run_forever/run