From 0845ec30b394b86a2c5c7e040f2747a0ffdd9390 Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Fri, 3 Nov 2023 15:00:13 -0700
Subject: [PATCH] Update install/etc folder contents

---
 install/etc/cont-init.d/10-db-backup          |  5 +-
 .../etc/services.available/10-db-backup/run   | 89 -------------------
 2 files changed, 2 insertions(+), 92 deletions(-)
 delete mode 100755 install/etc/services.available/10-db-backup/run

diff --git a/install/etc/cont-init.d/10-db-backup b/install/etc/cont-init.d/10-db-backup
index 4e854dd..546eae5 100755
--- a/install/etc/cont-init.d/10-db-backup
+++ b/install/etc/cont-init.d/10-db-backup
@@ -6,10 +6,9 @@ prepare_service 03-monitoring
 PROCESS_NAME="db-backup"
 output_off
 
-bootstrap_filesystem
-bootstrap_variables
-sanity_test
 setup_mode
+db_backup_container_init
+create_schedulers backup
 create_zabbix dbbackup
 
 liftoff
diff --git a/install/etc/services.available/10-db-backup/run b/install/etc/services.available/10-db-backup/run
deleted file mode 100755
index 1fd046d..0000000
--- a/install/etc/services.available/10-db-backup/run
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/command/with-contenv bash
-
-source /assets/functions/00-container
-source /assets/functions/10-db-backup
-source /assets/defaults/10-db-backup
-PROCESS_NAME="db-backup"
-
-bootstrap_variables
-
-write_log info "Starting instance - hostname $(hostname) container_name ${CONTAINER_NAME}"
-if [ "${MODE,,}" = "manual" ] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then
-    DB_DUMP_BEGIN=+0
-    manual=TRUE
-    write_log debug "Detected Manual Mode"
-else
-    sleep 5
-    current_time=$(date +"%s")
-    today=$(date +"%Y%m%d")
-
-    if [[ $DB_DUMP_BEGIN =~ ^\+(.*)$ ]]; then
-        waittime=$(( ${BASH_REMATCH[1]} * 60 ))
-        target_time=$(($current_time + $waittime))
-    else
-        target_time=$(date --date="${today}${DB_DUMP_BEGIN}" +"%s")
-        if [[ "$target_time" < "$current_time" ]]; then
-            target_time=$(($target_time + 24*60*60))
-        fi
-        waittime=$(($target_time - $current_time))
-    fi
-    write_log debug "Wait Time: ${waittime} Target time: ${target_time} Current Time: ${current_time}"
-    write_log info "Next Backup at $(date -d @${target_time} +"%Y-%m-%d %T %Z")"
-    sleep $waittime
-fi
-
-while true; do
-    mkdir -p "${TEMP_LOCATION}"
-    backup_start_time=$(date +"%s")
-    write_log debug "Backup routines started time: $(date +'%Y-%m-%d %T %Z')"
-    case "${dbtype,,}" in
-        "couch" )
-            check_availability
-            backup_couch
-        ;;
-        "influx" )
-            check_availability
-            backup_influx
-        ;;
-        "mssql" )
-            check_availability
-            backup_mssql
-        ;;
-        "mysql" )
-            check_availability
-            backup_mysql
-        ;;
-        "mongo" )
-            check_availability
-            backup_mongo
-        ;;
-        "pgsql" )
-            check_availability
-            backup_pgsql
-        ;;
-        "redis" )
-            check_availability
-            backup_redis
-        ;;
-        "sqlite3" )
-            check_availability
-            backup_sqlite3
-        ;;
-        esac
-
-    backup_finish_time=$(date +"%s")
-    backup_total_time=$(echo $((backup_finish_time-backup_start_time)))
-    if [ -z "$master_exit_code" ] ; then master_exit_code="0" ; fi
-    write_log info "Backup routines finish time: $(date -d @${backup_finish_time} +"%Y-%m-%d %T %Z") with overall exit code ${master_exit_code}"
-    write_log notice "Backup routines time taken: $(echo ${backup_total_time} | awk '{printf "Hours: %d Minutes: %02d Seconds: %02d", $1/3600, ($1/60)%60, $1%60}')"
-
-    cleanup_old_data
-
-    if var_true "${manual}" ; then
-        write_log debug "Exiting due to manual mode"
-        exit ${master_exit_code};
-    else
-        write_log notice "Sleeping for another $(($DB_DUMP_FREQ*60-backup_total_time)) seconds. Waking up at $(date -d@"$(( $(date +%s)+$(($DB_DUMP_FREQ*60-backup_total_time))))" +"%Y-%m-%d %T %Z") "
-        sleep $(($DB_DUMP_FREQ*60-backup_total_time))
-    fi
-done