Release 4.0.21 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 4.0.21 2023-11-22 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for SQLite backups not being cleaned up properly due to a malformed base
+
+
+## 4.0.20 2023-11-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Update base image to support S6 Overlay 3.1.6.2 to solve shutdown issues specifically with MODE=MANUAL and MANUAL_RUN_FOREVER=TRUE
+      - Add some safety nets for Manual scheduling
+
+
 ## 4.0.19 2023-11-20 <dave at tiredofit dot ca>
 
    ### Changed

install/assets/dbbackup/template-dbbackup/run

@@ -16,7 +16,7 @@ fi
 
 trap ctrl_c INT
 
-if [[ "${MODE,,}" =~ "standalone" ]] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then
+if [[ "${MODE,,}" =~ "standalone" ]] || [ "${MODE,,}" = "manual" ] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then
     print_debug "Detected Manual Mode"
     persist=false
     backup_job_backup_begin=+0

install/assets/functions/10-db-backup

@@ -851,7 +851,7 @@ backup_sqlite3() {
     db=$(basename "${backup_job_db_host}")
     db="${db%.*}"
     backup_job_filename=sqlite3_${db}_${now}.sqlite3
-    backup_job_filename_base=sqlite3_${db}.sqlite3
+    backup_job_filename_base=sqlite3_${db}
     pre_dbbackup "${db}"
     write_log notice "Dumping sqlite3 database: '${backup_job_db_host}' ${compression_string}"
     if var_true "${DEBUG_BACKUP_SQLITE3}" ; then debug on; fi
@@ -1160,13 +1160,14 @@ create_schedulers() {
             instance=$(printf "%02d" $instance)
             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
 #!/bin/bash
 source /assets/functions/00-container
 PROCESS_NAME=db-backup${instance}
 print_info "Starting Manual Backup for db-backup${instance}"
-/var/run/s6/legacy-services/dbbackup-${instance}/run now
+#/var/run/s6/legacy-services/dbbackup-${instance}/run now
+/etc/services.available/dbbackup-${instance}/run now
 
 EOF
             chmod +x /usr/bin/backup"${instance}"-now
@@ -1176,11 +1177,11 @@ EOF
                 cat <<EOF > /usr/bin/backup-now
 #!/bin/bash
 
-/usr/bin/backup${instance}-now
+/usr/bin/backup${instance}-now now
 
 EOF
             else
-                echo "/usr/bin/backup${instance}-now" >> /usr/bin/backup-now
+                echo "/usr/bin/backup${instance}-now now" >> /usr/bin/backup-now
             fi
 
             instance=$(echo "${instance} +1" | bc)