Release 4.0.30 - See CHANGELOG.md

Update 10-db-backup msmtp -C

Dockerfile

@@ -1,68 +1,73 @@
 ARG DISTRO=alpine
-ARG DISTRO_VARIANT=edge
+ARG DISTRO_VARIANT=3.19
 
 FROM docker.io/tiredofit/${DISTRO}:${DISTRO_VARIANT}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
 ### Set Environment Variables
-ENV INFLUX_VERSION=1.8.0 \
-    INFLUX2_VERSION=2.4.0 \
+ENV INFLUX1_CLIENT_VERSION=1.8.0 \
+    INFLUX2_CLIENT_VERSION=2.7.3 \
     MSODBC_VERSION=18.3.2.1-1 \
     MSSQL_VERSION=18.3.1.1-1 \
-    AWS_CLI_VERSION=1.25.97 \
-    CONTAINER_ENABLE_MESSAGING=FALSE \
+    AWS_CLI_VERSION=1.31.5 \
+    CONTAINER_ENABLE_MESSAGING=TRUE \
     CONTAINER_ENABLE_MONITORING=TRUE \
-    CONTAINER_PROCESS_RUNAWAY_PROTECTOR=FALSE \
     IMAGE_NAME="tiredofit/db-backup" \
     IMAGE_REPO_URL="https://github.com/tiredofit/docker-db-backup/"
 
 ### Dependencies
 RUN source /assets/functions/00-container && \
     set -ex && \
+    addgroup -S -g 10000 dbbackup && \
+    adduser -S -D -H -u 10000 -G dbbackup -g "Tired of I.T! DB Backup" dbbackup && \
+    \
     package update && \
     package upgrade && \
     package install .db-backup-build-deps \
-               build-base \
-               bzip2-dev \
-               cargo \
-               git \
-               go \
-               libarchive-dev \
-               openssl-dev \
-               libffi-dev \
-               python3-dev \
-               py3-pip \
-               xz-dev \
-               && \
+                    build-base \
+                    bzip2-dev \
+                    cargo \
+                    git \
+                    go \
+                    libarchive-dev \
+                    openssl-dev \
+                    libffi-dev \
+                    python3-dev \
+                    py3-pip \
+                    xz-dev \
+                    && \
     \
     package install .db-backup-run-deps \
-               bzip2 \
-               groff \
-               libarchive \
-               mariadb-client \
-               mariadb-connector-c \
-               mongodb-tools \
-               openssl \
-               pigz \
-               postgresql16 \
-               postgresql16-client \
-               pv \
-               py3-botocore \
-               py3-colorama \
-               py3-cryptography \
-               py3-docutils \
-               py3-jmespath \
-               py3-rsa \
-               py3-setuptools \
-               py3-s3transfer \
-               py3-yaml \
-               python3 \
-               redis \
-               sqlite \
-               xz \
-               zip \
-               zstd \
-               && \
+                    bzip2 \
+                    coreutils \
+                    gpg \
+                    gpg-agent \
+                    groff \
+                    libarchive \
+                    mariadb-client \
+                    mariadb-connector-c \
+                    mongodb-tools \
+                    openssl \
+                    pigz \
+                    postgresql16 \
+                    postgresql16-client \
+                    pv \
+                    py3-botocore \
+                    py3-colorama \
+                    py3-cryptography \
+                    py3-docutils \
+                    py3-jmespath \
+                    py3-rsa \
+                    py3-setuptools \
+                    py3-s3transfer \
+                    py3-yaml \
+                    python3 \
+                    redis \
+                    sqlite \
+                    xz \
+                    zip \
+                    zstd \
+                    && \
     \
     apkArch="$(uname -m)"; \
     case "$apkArch" in \
@@ -71,11 +76,9 @@ RUN source /assets/functions/00-container && \
         *) sleep 0.1 ;; \
     esac; \
     \
-    if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; ls -l ; echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; else echo >&2 "Detected non x86_64 or ARM64 build variant, skipping MSSQL installation" ; fi; \
-    if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \
-    clone_git_repo https://github.com/aws/aws-cli "${AWS_CLI_VERSION}" && \
-    python3 setup.py install --prefix=/usr && \
-    clone_git_repo https://github.com/influxdata/influxdb "${INFLUX_VERSION}" && \
+    if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; else echo >&2 "Detected non x86_64 or ARM64 build variant, skipping MSSQL installation" ; fi; \
+    if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_CLIENT_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \
+    clone_git_repo https://github.com/influxdata/influxdb "${INFLUX1_CLIENT_VERSION}" && \
     go build -o /usr/sbin/influxd ./cmd/influxd && \
     strip /usr/sbin/influxd && \
     mkdir -p /usr/src/pbzip2 && \
@@ -94,6 +97,7 @@ RUN source /assets/functions/00-container && \
     make && \
     make install && \
     \
+    pip3 install --break-system-packages awscli==${AWS_CLI_VERSION} && \
     pip3 install --break-system-packages blobxfer && \
     \
     package remove .db-backup-build-deps && \
@@ -106,5 +110,4 @@ RUN source /assets/functions/00-container && \
             /tmp/* \
             /usr/src/*
 
-
 COPY install  /

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Dave Conroy
+Copyright (c) 2023 Dave Conroy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

examples/compose.yml

@@ -0,0 +1,67 @@
+services:
+  example-db:
+    hostname: example-db-host
+    container_name: example-db
+    image: tiredofit/mariadb:10.11
+    ports:
+      - 3306:3306
+    volumes:
+      - ./db:/var/lib/mysql
+    environment:
+      - ROOT_PASS=examplerootpassword
+      - DB_NAME=example
+      - DB_USER=example
+      - DB_PASS=examplepassword
+    restart: always
+    networks:
+      - example-db-network
+
+  example-db-backup:
+    container_name: example-db-backup
+    image: tiredofit/db-backup
+    volumes:
+      - ./backups:/backup
+      #- ./post-script.sh:/assets/custom-scripts/post-script.sh
+    environment:
+      - TIMEZONE=America/Vancouver
+      - CONTAINER_NAME=example-db-backup
+      - CONTAINER_ENABLE_MONITORING=FALSE
+      # - DEBUG_MODE=TRUE
+
+      - BACKUP_JOB_CONCURRENCY=1     # Only run one job at a time
+      - DEFAULT_CHECKSUM=NONE        # Don't create checksums
+      - DEFAULT_COMPRESSION=ZSTD     # Compress all with ZSTD
+      - DEFAULT_DUMP_INTERVAL=1440   # Backup every 1440 minutes
+      - DEFAULT_DUMP_BEGIN=0000      # Start backing up at midnight
+      - DEFAULT_CLEANUP_TIME=8640    # Cleanup backups after a week
+
+      - DB01_TYPE=mariadb
+      - DB01_HOST=example-db-host
+      - DB01_NAME=example
+      - DB01_USER=example
+      - DB01_PASS=examplepassword
+      - DB01_DUMP_INTERVAL=30        # (override) Backup every 30 minutes
+      - DB01_DUMP_BEGIN=+1           # (override) Backup starts immediately
+      - DB01_CLEANUP_TIME=180        # (override) Cleanup backups they are older than 180 minutes
+      - DB01_CHECKSUM=SHA1           # (override) Create a SHA1 checksum
+      - DB01_COMPRESSION=GZ          # (override) Compress with GZIP
+
+      #- DB02_TYPE=postgres
+      #- DB02_HOST=example-postgres-host
+      #- DB02_NAME=example
+      #- DB02_USER=example
+      #- DB02_PASS=examplepassword
+      #- DB02_DUMP_INTERVAL=60         # (override) Backup every 60 minutes
+      #- DB02_DUMP_BEGIN=+10           # (override) Backup starts in ten minutes
+      #- DB02_CLEANUP_TIME=240         # (override) Cleanup backups they are older than 240 minutes
+      #- DB02_CHECKSUM=MD5             # (override) Create a SHA1 checksum
+      #- DB02_COMPRESSION=BZ           # (override) Compress with BZIP
+
+    restart: always
+    networks:
+      - example-db-network
+
+networks:
+  example-db-network:
+    name: example-db-network
+

examples/mssql-blobxfer/compose.yml

@@ -1,13 +1,7 @@
-# 
+#
 # Example for Microsoft SQL Server
 # upload with blobxfer to azure storage
-# 
-
-version: '2'
-
-networks:
-  example-mssql-blobxfer-net:
-    name: example-mssql-blobxfer-net
+#
 
 services:
   example-mssql-s3-db:
@@ -32,7 +26,7 @@ services:
     # execute in terminal --> docker build -t tiredofit/db-backup-mssql-blobxfer .
     # replace --> image: tiredofit/db-backup-mssql
     # image: tiredofit/db-backup
-    image: tiredofit/db-backup-mssql-blobxfer
+    image: tiredofit/db-backup
     links:
      - example-mssql-s3-db
     volumes:
@@ -40,30 +34,35 @@ services:
       - ./tmp/backups:/tmp/backups    # shared tmp backup directory
       #- ./post-script.sh:/assets/custom-scripts/post-script.sh
     environment:
-      # - DEBUG_MODE=TRUE
-      - DB_TYPE=mssql
-      - DB_HOST=example-db-host
-      # - DB_PORT=1488
-      # - DB_NAME=ALL             # [ALL] not working on sql server.
-      # create database with name `test1` manually first
-      - DB_NAME=test1             # Create this database
-      - DB_USER=sa
-      - DB_PASS=5hQa0utRFBpIY3yhoIyE
-      - DB_DUMP_FREQ=1            # backup every 5 minute
-      # - DB_DUMP_BEGIN=0000      # backup starts immediately
-      - DB_CLEANUP_TIME=3         # clean backups they are older than 60 minutes
-      - ENABLE_CHECKSUM=TRUE
-      - CHECKSUM=SHA1
-      - COMPRESSION=GZ
-      - SPLIT_DB=FALSE
+      - TIMEZONE=America/Vancouver
       - CONTAINER_ENABLE_MONITORING=FALSE
+      - CONTAINER_NAME=example-mssql-blobxfer-db-backup
+      # - DEBUG_MODE=TRUE
+      - DB01_TYPE=mssql
+      - DB01_HOST=example-db-host
+      # - DB01_PORT=1488
+      # create database with name `test1` manually first
+      - DB01_NAME=test1             # Create this database
+      - DB01_USER=sa
+      - DB01_PASS=5hQa0utRFBpIY3yhoIyE
+      - DB01_DUMP_INTERVAL=5        # backup every 5 minute
+      # - DB01_DUMP_BEGIN=0000      # backup starts at midnight vs not set immediately
+      - DB01_CLEANUP_TIME=60         # clean backups they are older than 60 minutes
+      - DB01_CHECKSUM=SHA1          # Set Checksum to be SHA1
+      - DB01_COMPRESSION=GZ         # Set compression to use GZIP
+
+
       # === S3 Blobxfer ===
-      - BACKUP_LOCATION=blobxfer
+      - DB01_BACKUP_LOCATION=blobxfer
       # Add here azure storage account
-      - BLOBXFER_STORAGE_ACCOUNT={TODO Add Storage Name}
+      - DB01_BLOBXFER_STORAGE_ACCOUNT={TODO Add Storage Name}
       # Add here azure storage account key
-      - BLOBXFER_STORAGE_ACCOUNT_KEY={TODO Add Key}
-      - BLOBXFER_REMOTE_PATH=docker-db-backup
+      - DB01_BLOBXFER_STORAGE_ACCOUNT_KEY={TODO Add Key}
+      - DB01_BLOBXFER_REMOTE_PATH=docker-db-backup
     restart: always
     networks:
-      example-mssql-blobxfer-net:
+      example-mssql-blobxfer-net:
+
+networks:
+  example-mssql-blobxfer-net:
+    name: example-mssql-blobxfer-net

examples/mssql/compose.yml

@@ -1,12 +1,6 @@
-# 
+#
 # Example for Microsoft SQL Server
-# 
-
-version: '2'
-
-networks:
-  example-mssql-net:
-    name: example-mssql-net
+#
 
 services:
   example-mssql-db:
@@ -31,7 +25,7 @@ services:
     # execute in terminal --> docker build -t tiredofit/db-backup-mssql .
     # replace --> image: tiredofit/db-backup-mssql
     # image: tiredofit/db-backup
-    image: tiredofit/db-backup-mssql
+    image: tiredofit/db-backup
     links:
      - example-mssql-db
     volumes:
@@ -39,23 +33,28 @@ services:
       - ./tmp/backups:/tmp/backups    # shared tmp backup directory
       #- ./post-script.sh:/assets/custom-scripts/post-script.sh
     environment:
+      - TIMEZONE=America/Vancouver
+      - CONTAINER_ENABLE_MONITORING=FALSE
+      - CONTAINER_NAME=example-mssql-blobxfer-db-backup
+
       # - DEBUG_MODE=TRUE
-      - DB_TYPE=mssql
-      - DB_HOST=example-db-host
+      - DB01_TYPE=mssql
+      - DB01_HOST=example-db-host
       # - DB_PORT=1488
       # - DB_NAME=ALL             # [ALL] not working on sql server.
       # create database with name `test1` manually first
-      - DB_NAME=test1
-      - DB_USER=sa
-      - DB_PASS=5hQa0utRFBpIY3yhoIyE
-      - DB_DUMP_FREQ=1            # backup every minute
-      # - DB_DUMP_BEGIN=0000      # backup starts immediately
-      - DB_CLEANUP_TIME=5         # clean backups they are older than 5 minute
-      - ENABLE_CHECKSUM=FALSE
-      - CHECKSUM=SHA1
-      - COMPRESSION=GZ
-      - SPLIT_DB=FALSE
-      - CONTAINER_ENABLE_MONITORING=FALSE
+      - DB01_NAME=test1
+      - DB01_USER=sa
+      - DB01_PASS=5hQa0utRFBpIY3yhoIyE
+      - DB01_DUMP_INTERVAL=1            # backup every minute
+      # - DB01_DUMP_BEGIN=0000      # backup starts at midnight vs unset immediately
+      - DB01_CLEANUP_TIME=5         # clean backups they are older than 5 minute
+      - DB01_CHECKSUM=NONE
+      - DB01_COMPRESSION=GZ
     restart: always
     networks:
-      example-mssql-net:
+      example-mssql-net:
+
+networks:
+  example-mssql-net:
+    name: example-mssql-net

examples/mysql/docker-compose.yml

@@ -1,53 +0,0 @@
-version: '2'
-
-networks:
-  example-db-network:
-    name: example-db-network
-
-services:
-  example-db:
-    hostname: example-db-host
-    container_name: example-db
-    image: mariadb:latest
-    ports:
-      - 13306:3306
-    volumes:
-      - ./db:/var/lib/mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=examplerootpassword
-      - MYSQL_DATABASE=example
-      - MYSQL_USER=example
-      - MYSQL_PASSWORD=examplepassword
-    restart: always
-    networks:
-      - example-db-network
-
-  example-db-backup:
-    container_name: example-db-backup
-    image: tiredofit/db-backup
-    links:
-     - example-db
-    volumes:
-      - ./backups:/backup
-      #- ./post-script.sh:/assets/custom-scripts/post-script.sh
-    environment:
-      - TIMEZONE=America/Vancouver
-      - CONTAINER_ENABLE_MONITORING=FALSE
-      # - DEBUG_MODE=TRUE
-      - DB_TYPE=mariadb
-      - DB_HOST=example-db-host
-      - DB_NAME=example
-      - DB_USER=example
-      - DB_PASS=examplepassword
-      - DB_DUMP_FREQ=1            # backup every minute
-      # - DB_DUMP_BEGIN=0000      # backup starts immediately
-      - DB_CLEANUP_TIME=5         # clean backups they are older than 5 minute
-      - CHECKSUM=SHA1
-      - COMPRESSION=GZ
-      - SPLIT_DB=FALSE
-
-    restart: always
-    networks:
-      - example-db-network
-
-

examples/post-script.sh

@@ -4,7 +4,7 @@
 # #### $1=EXIT_CODE (After running backup routine)
 # #### $2=DB_TYPE (Type of Backup)
 # #### $3=DB_HOST (Backup Host)
-# #### #4=DB_NAME (Name of Database backed up
+# #### #4=DB_NAME (Name of Database backed up)
 # #### $5=BACKUP START TIME (Seconds since Epoch)
 # #### $6=BACKUP FINISH TIME (Seconds since Epoch)
 # #### $7=BACKUP TOTAL TIME (Seconds between Start and Finish)

install/assets/dbbackup/template-dbbackup/run

@@ -0,0 +1,120 @@
+#!/command/with-contenv bash
+
+source /assets/functions/00-container
+PROCESS_NAME="db-backup{{BACKUP_NUMBER}}-scheduler"
+check_container_initialized
+check_service_initialized init 10-db-backup
+source /assets/functions/10-db-backup
+source /assets/defaults/10-db-backup
+bootstrap_variables backup_init {{BACKUP_NUMBER}}
+bootstrap_variables parse_variables {{BACKUP_NUMBER}}
+if [ -z "${backup_job_db_name}" ]; then
+    PROCESS_NAME="{{BACKUP_NUMBER}}${backup_job_db_host//\//_}"
+else
+    PROCESS_NAME="{{BACKUP_NUMBER}}-${backup_job_db_host//\//_}__${backup_job_db_name}"
+fi
+
+trap ctrl_c INT
+
+if [[ "${MODE,,}" =~ "standalone" ]] || [ "${MODE,,}" = "manual" ] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then
+    print_debug "Detected Manual Mode"
+    persist=false
+    backup_job_backup_begin=+0
+else
+    silent sleep {{BACKUP_NUMBER}}
+    time_last_run=0
+    time_current=$(date +'%s')
+    if [[ "${backup_job_backup_begin}" =~ ^\+(.*)$ ]]; then
+        print_debug "BACKUP_BEGIN is a jump of minute starting with +"
+        timer plusvalue
+    elif [[ "${backup_job_backup_begin}" =~ ^[0-9]{4}$ ]]; then
+        print_debug "BACKUP_BEGIN is a HHMM value"
+        timer time
+    elif [[ "${backup_job_backup_begin}" =~ ([0-9]{4})-([0-9]{2})-([0-9]{2})[[:space:]]([0-9]{2}):([0-9]{2}):([0-9]{2}) ]]; then
+        print_debug "BACKUP_BEGIN is a full date timestamp"
+        timer datetime
+    #elif echo "${backup_job_backup_begin//\*/#}" | grep -qP "^(.*((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|#) ?){5}$" ; then # Allow slashes, yet not supporting advanced cron yet
+    elif echo "${backup_job_backup_begin//\*/#}" | grep -qP "^(((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|#) ?){5}$" ; then
+        print_debug "BACKUP_BEGIN is a cron expression"
+        if var_false "${CRON_ALTERNATE}"; then
+            time_last_run=$(date +"%s")
+
+            backup_job_backup_begin=${backup_job_backup_begin//\"/}
+            backup_job_backup_begin=${backup_job_backup_begin//\'/}
+            timer cron "${backup_job_backup_begin}" "${time_current}" "${time_last_run}"
+        else
+            echo "${backup_job_backup_begin} /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}/run now" > /tmp/.container/cron/{{BACKUP_NUMBER}}-backup
+            crontab -l | { cat; echo "${backup_job_backup_begin} /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}/run now"; } | crontab -
+            s6-svc -d /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}
+            exit 0
+        fi
+    else
+        print_error "_BACKUP_BEGIN is invalid - Unable to perform scheduling"
+        cat <<EOF
+
+        Valid Methods:
+          +(number)             - Start in however many minutes
+          HHMM                  - Start at hour (00-24) and minute (00-59)
+          YYYY-MM-DD HH:mm:ss   - Start at a specific date and time
+          0 23 * * *            - Cron expression
+
+EOF
+        print_error "Stopping backup_scheduler {{BACKUP_NUMBER}} due to detected errors. Fix and restart container."
+        stop_scheduler_backup=true
+        s6-svc -d /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}
+    fi
+
+    print_debug "Wait Time: ${time_wait} Future execution time: ${time_future} Current Time: ${time_current}"
+    print_info "Next Backup at $(date -d @"${time_future}" +'%Y-%m-%d %T %Z')"
+    silent sleep "${time_wait}"
+fi
+
+while true; do
+    if [ -n "${backup_job_blackout_start}" ] && [ -n "${backup_job_blackout_finish}" ] ; then
+        time_current_hour_minute=$(date +%H%M)
+        if [[ "${time_current_hour_minute}" > "${backup_job_blackout_start}" ]] && [[ "${time_current_hour_minute}" < "${backup_job_blackout_finish}" ]] ; then
+            blackout=true
+        else
+            blackout=false
+        fi
+    fi
+
+    if var_true "${blackout}" ; then
+        print_notice "Detected Blackout Period - Not performing backup operations"
+    else
+        timer job start
+        process_limiter
+        echo "{{BACKUP_NUMBER}}" >> /tmp/.container/db-backup-backups
+        print_debug "Backup {{BACKUP_NUMBER}} routines started time: $(date +'%Y-%m-%d %T %Z')"
+        bootstrap_filesystem
+        check_availability
+        backup_"${dbtype,,}"
+        timer job stop
+        if [ -z "${exitcode_backup}" ] ; then exitcode_backup="0" ; fi
+        print_info "Backup {{BACKUP_NUMBER}} routines finish time: $(date -d @"${backup_job_finish_time}" +'%Y-%m-%d %T %Z') with exit code ${exitcode_backup}"
+        print_notice "Backup {{BACKUP_NUMBER}} routines time taken: $(echo "${backup_job_total_time}" | awk '{printf "Hours: %d Minutes: %02d Seconds: %02d", $1/3600, ($1/60)%60, $1%60}')"
+        sed -i "/^{{BACKUP_NUMBER}}/d" /tmp/.container/db-backup-backups
+    fi
+
+    symlink_log
+
+    if var_false "${persist}" ; then
+        print_debug "Exiting due to manual mode"
+        exit "${exitcode_backup}";
+    else
+        if var_true "${stop_scheduler_backup}" ; then
+            print_error "Stopping backup_scheduler {{BACKUP_NUMBER}} due to detected errors. Fix and restart container."
+            s6-svc -d /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}
+        else
+            if [ ! "${time_cron}" = "true" ]; then
+                print_notice "Sleeping for another $((backup_job_backup_interval*60-backup_job_total_time)) seconds. Waking up at $(date -d@"$(( $(date +%s)+$((backup_job_backup_interval*60-backup_job_total_time))))" +'%Y-%m-%d %T %Z') "
+                silent sleep $((backup_job_backup_interval*60-backup_job_total_time))
+            else
+                time_last_run=$(date +"%s")
+                timer cron "${backup_job_backup_begin}" "${time_current}" "${time_last_run}"
+                print_notice "Sleeping for another ${time_wait} seconds. Waking up at $(date -d@"${time_future}" +'%Y-%m-%d %T %Z') "
+                silent sleep "${time_wait}"
+            fi
+        fi
+    fi
+done

install/assets/defaults/10-db-backup

@@ -1,32 +1,47 @@
 #!/command/with-contenv bash
 
-BACKUP_LOCATION=${BACKUP_LOCATION:-"FILESYSTEM"}
-BLOBXFER_REMOTE_PATH=${BLOBXFER_REMOTE_PATH:-"/docker-db-backup"}
-CHECKSUM=${CHECKSUM:-"MD5"}
-COMPRESSION=${COMPRESSION:-"ZSTD"}
-COMPRESSION_LEVEL=${COMPRESSION_LEVEL:-"3"}
-CREATE_LATEST_SYMLINK=${CREATE_LATEST_SYMLINK:-"TRUE"}
-DB_DUMP_BEGIN=${DB_DUMP_BEGIN:-+0}
-DB_DUMP_FREQ=${DB_DUMP_FREQ:-1440}
-DB_DUMP_TARGET=${DB_DUMP_TARGET:-"/backup"}
-DB_DUMP_TARGET_ARCHIVE=${DB_DUMP_TARGET_ARCHIVE:-"${DB_DUMP_TARGET}/archive/"}
-ENABLE_CHECKSUM=${ENABLE_CHECKSUM:-"TRUE"}
-ENABLE_PARALLEL_COMPRESSION=${ENABLE_PARALLEL_COMPRESSION:-"TRUE"}
+BACKUP_JOB_CONCURRENCY=${BACKUP_JOB_CONCURRENCY:-"1"}
+CRON_ALTERNATE=${CRON_ALTERNATE:-"TRUE"}
+DBBACKUP_USER=${DBBACKUP_USER:-"dbbackup"}
+DBBACKUP_GROUP=${DBBACKUP_GROUP:-"${DBBACKUP_USER}"} # Must go after DBBACKUP_USER
+DEFAULT_BACKUP_BEGIN=${DEFAULT_BACKUP_BEGIN:-+0}
+DEFAULT_BACKUP_INTERVAL=${DEFAULT_BACKUP_INTERVAL:-1440}
+DEFAULT_BACKUP_INTERVAL=${DEFAULT_BACKUP_INTERVAL:-1440}
+DEFAULT_BACKUP_LOCATION=${DEFAULT_BACKUP_LOCATION:-"FILESYSTEM"}
+DEFAULT_BLOBXFER_REMOTE_PATH=${DEFAULT_BLOBXFER_REMOTE_PATH:-"/docker-db-backup"}
+DEFAULT_CHECKSUM=${DEFAULT_CHECKSUM:-"MD5"}
+DEFAULT_COMPRESSION=${DEFAULT_COMPRESSION:-"ZSTD"}
+DEFAULT_COMPRESSION_LEVEL=${DEFAULT_COMPRESSION_LEVEL:-"3"}
+DEFAULT_CREATE_LATEST_SYMLINK=${DEFAULT_CREATE_LATEST_SYMLINK:-"TRUE"}
+DEFAULT_ENABLE_PARALLEL_COMPRESSION=${DEFAULT_ENABLE_PARALLEL_COMPRESSION:-"TRUE"}
+DEFAULT_ENCRYPT=${DEFAULT_ENCRYPT:-"FALSE"}
+DEFAULT_FILESYSTEM_PATH=${DEFAULT_FILESYSTEM_PATH:-"/backup"}
+DEFAULT_FILESYSTEM_PATH_PERMISSION=${DEFAULT_FILESYSTEM_PATH_PERMISSION:-"700"}
+DEFAULT_FILESYSTEM_PERMISSION=${DEFAULT_FILESYSTEM_PERMISSION:-"600"}
+DEFAULT_FILESYSTEM_ARCHIVE_PATH=${DEFAULT_FILESYSTEM_ARCHIVE_PATH:-"${DEFAULT_FILESYSTEM_PATH}/archive/"}
+DEFAULT_LOG_LEVEL=${DEFAULT_LOG_LEVEL:-"notice"}
+DEFAULT_MYSQL_ENABLE_TLS=${DEFAULT_MYSQL_ENABLE_TLS:-"FALSE"}
+DEFAULT_MYSQL_EVENTS=${DEFAULT_MYSQL_EVENTS:-"TRUE"}
+DEFAULT_MYSQL_MAX_ALLOWED_PACKET=${DEFAULT_MYSQL_MAX_ALLOWED_PACKET:-"512M"}
+DEFAULT_MYSQL_SINGLE_TRANSACTION=${DEFAULT_MYSQL_SINGLE_TRANSACTION:-"TRUE"}
+DEFAULT_MYSQL_STORED_PROCEDURES=${DEFAULT_MYSQL_STORED_PROCEDURES:-"TRUE"}
+DEFAULT_MYSQL_TLS_CA_FILE=${DEFAULT_MYSQL_TLS_CA_FILE:-"/etc/ssl/cert.pem"}
+DEFAULT_MYSQL_TLS_VERIFY=${DEFAULT_MYSQL_TLS_VERIFY:-"FALSE"}
+DEFAULT_MYSQL_TLS_VERSION=${DEFAULT_MYSQL_TLS_VERSION:-"TLSv1.1,TLSv1.2,TLSv1.3"}
+DEFAULT_MSSQL_MODE=${DEFAULT_MSSQL_MODE:-"database"}
+DEFAULT_PARALLEL_COMPRESSION_THREADS=${DEFAULT_PARALLEL_COMPRESSION_THREADS:-"$(nproc)"}
+DEFAULT_RESOURCE_OPTIMIZED=${DEFAULT_RESOURCE_OPTIMIZED:-"FALSE"}
+DEFAULT_S3_CERT_SKIP_VERIFY=${DEFAULT_S3_CERT_SKIP_VERIFY:-"TRUE"}
+DEFAULT_S3_PROTOCOL=${DEFAULT_S3_PROTOCOL:-"https"}
+DEFAULT_SCRIPT_LOCATION_PRE=${DEFAULT_SCRIPT_LOCATION_PRE:-"/assets/scripts/pre/"}
+DEFAULT_SCRIPT_LOCATION_POST=${DEFAULT_SCRIPT_LOCATION_POST:-"/assets/scripts/post/"}
+DEFAULT_SIZE_VALUE=${DEFAULT_SIZE_VALUE:-"bytes"}
+DEFAULT_SKIP_AVAILABILITY_CHECK=${DEFAULT_SKIP_AVAILABILITY_CHECK:-"FALSE"}
+DEFAULT_SPLIT_DB=${DEFAULT_SPLIT_DB:-"TRUE"}
+LOG_PATH=${LOG_PATH:-"/logs"}
 MANUAL_RUN_FOREVER=${MANUAL_RUN_FOREVER:-"TRUE"}
 MODE=${MODE:-"AUTO"}
-MYSQL_ENABLE_TLS=${MYSQL_ENABLE_TLS:-"FALSE"}
-MYSQL_MAX_ALLOWED_PACKET=${MYSQL_MAX_ALLOWED_PACKET:-"512M"}
-MYSQL_SINGLE_TRANSACTION=${MYSQL_SINGLE_TRANSACTION:-"TRUE"}
-MYSQL_STORED_PROCEDURES=${MYSQL_STORED_PROCEDURES:-"TRUE"}
-MYSQL_TLS_CA_FILE=${MYSQL_TLS_CA_FILE:-"/etc/ssl/cert.pem"}
-MYSQL_TLS_VERIFY=${MYSQL_TLS_VERIFY:-"FALSE"}
-MYSQL_TLS_VERSION=${MYSQL_TLS_VERSION:-"TLSv1.1,TLSv1.2,TLSv1.3"}
-PARALLEL_COMPRESSION_THREADS=${PARALLEL_COMPRESSION_THREADS:-"$(nproc)"}
-S3_CERT_SKIP_VERIFY=${S3_CERT_SKIP_VERIFY:-"TRUE"}
-S3_PROTOCOL=${S3_PROTOCOL:-"https"}
-SCRIPT_LOCATION_PRE=${SCRIPT_LOCATION_PRE:-"/assets/scripts/pre/"}
-SCRIPT_LOCATION_POST=${SCRIPT_LOCATION_POST:-"/assets/scripts/post/"}
-SIZE_VALUE=${SIZE_VALUE:-"bytes"}
-SKIP_AVAILABILITY_CHECK=${SKIP_AVAILABILITY_CHECK:-"FALSE"}
-SPLIT_DB=${SPLIT_DB:-"TRUE"}
-TEMP_LOCATION=${TEMP_LOCATION:-"/tmp/backups"}
+
+TEMP_PATH=${TEMP_PATH:-"/tmp/backups"}
+if [ -n "${TEMP_LOCATION}" ] ; then TEMP_PATH=${TEMP_LOCATION:-"/tmp/backups"} ; fi  # To be removed 4.3.0
+

install/etc/cont-init.d/10-db-backup

@@ -6,9 +6,9 @@ prepare_service 03-monitoring
 PROCESS_NAME="db-backup"
 output_off
 
-bootstrap_variables
-sanity_test
 setup_mode
-create_zabbix dbbackup
+db_backup_container_init
+create_schedulers backup
+create_zabbix dbbackup4
 
 liftoff

install/etc/services.available/10-db-backup/run

@@ -1,88 +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
-
-if [ "${MODE,,}" = "manual" ] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then
-    DB_DUMP_BEGIN=+0
-    manual=TRUE
-    print_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
-    print_debug "Wait Time: ${waittime} Target time: ${target_time} Current Time: ${current_time}"
-    print_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")
-    print_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
-    print_info "Backup routines finish time: $(date -d @${backup_finish_time} +"%Y-%m-%d %T %Z") with overall exit code ${master_exit_code}"
-    print_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
-        print_debug "Exiting due to manual mode"
-        exit ${master_exit_code};
-    else
-        print_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

install/usr/local/bin/backup-now

@@ -1,4 +0,0 @@
-#!/command/with-contenv bash
-
-echo '** Performing Manual Backup'
-/etc/services.available/10-db-backup/run manual

install/usr/local/bin/logrotate_dbbackup

@@ -0,0 +1,24 @@
+#!/command/with-contenv bash
+
+source /assets/functions/00-container
+source /assets/defaults/05-logging
+source /assets/defaults/10-db-backup
+
+## Compress each log 2 days old
+timestamp_2dayold_unixtime="$(stat -c %Y "${LOG_PATH}"/"$(date --date='2 days ago' +'%Y%m%d')")"
+for logfile in "${LOG_PATH}"/"$(date --date='2 days ago' +'%Y%m%d')"/"$(date --date='2 days ago' +'%Y%m%d')"_*.log ; do
+    sudo -u restic zstd --rm --rsyncable "${logfile}"
+done
+touch -t $(date -d"@${timestamp_2dayold_unixtime}" +'%Y%m%d%H%m.%S') "${LOG_PATH}"/"$(date --date='2 days ago' +'%Y%m%d')"
+
+# Look fook files older than certain day and delete
+if [ -n "${LOG_PATH}" ] && [ -d "${LOG_PATH}" ] ; then
+    find "${LOG_PATH}" -mtime +"${LOGROTATE_RETAIN_DAYS}" -type d -exec rm -rf {} +
+fi
+
+# Look for stale symbolic links and delete accordingly
+for symbolic_link in "${LOG_PATH}"/latest*.log ; do
+    if [ ! -e "${symbolic_link}" ] ; then
+        rm -rf "${symbolic_link}"
+    fi
+done

install/usr/local/bin/restore

@@ -29,7 +29,6 @@ bdgy="\e[100m"     # Background Color Dark Gray
 blr="\e[101m"      # Background Color Light Red
 boff="\e[49m"      # Background Color Off
 
-bootstrap_variables
 
 if [ -z "${1}" ] ; then
     interactive_mode=true
@@ -38,7 +37,7 @@ else
         "-h" )
             cat <<EOF
 ${IMAGE_NAME} Restore Tool ${IMAGE_VERSION}
-(c) 2022 Dave Conroy (https://github.com/tiredofit)
+(c) 2023 Dave Conroy (https://github.com/tiredofit) (https://www.tiredofit.ca)
 
 This script will assist you in recovering databases taken by the Docker image.
 You will be presented with a series of menus allowing you to choose:
@@ -75,10 +74,17 @@ EOF
     esac
 fi
 
+
+control_c() {
+    if [ -f "${restore_vars}" ] ; then rm -rf "${restore_vars}" ; fi
+    print_warn "User aborted"
+    exit
+}
+
 get_filename() {
     COLUMNS=12
     prompt="Please select a file to restore:"
-    options=( $(find "${DB_DUMP_TARGET}" -type f -maxdepth 1  -not -name '*.md5' -not -name '*.sha1' -print0 | sort -z | xargs -0) )
+    options=( $(find "${DEFAULT_FILESYSTEM_PATH}" -type f -maxdepth 2  -not -name '*.md5' -not -name '*.sha1' -print0 | sort -z | xargs -0) )
     PS3="$prompt "
     select opt in "${options[@]}" "Custom" "Quit" ; do
         if (( REPLY == 2 + ${#options[@]} )) ; then
@@ -104,13 +110,17 @@ get_filename() {
 
 get_dbhost() {
     p_dbhost=$(basename -- "${r_filename}" | cut -d _ -f 3)
-
     if [ -n "${p_dbhost}" ]; then
         parsed_host=true
         print_debug "Parsed DBHost: ${p_dbhost}"
+
+        if grep -q "${p_dbhost}" "${restore_vars}" ; then
+            detected_host_num=$(grep "${p_dbhost}" "${restore_vars}" | head -n1 | cut -c 3,4)
+            detected_host_value=$(grep "${p_dbhost}" "${restore_vars}" | head -n1 | cut -d '=' -f 2)
+        fi
     fi
 
-    if [ -z "${DB_HOST}" ] && [ -z "${parsed_host}" ]; then
+    if [ -z "${detected_host_value}" ] && [ -z "${parsed_host}" ]; then
         print_debug "Parsed DBHost Variant: 1 - No Env, No Parsed Filename"
         q_dbhost_variant=1
         q_dbhost_menu=$(cat <<EOF
@@ -119,18 +129,18 @@ EOF
                         )
     fi
 
-    if [ -n "${DB_HOST}" ] && [ -z "${parsed_host}" ]; then
+    if [ -n "${detected_host_value}" ] && [ -z "${parsed_host}" ]; then
         print_debug "Parsed DBHost Variant: 2 - Env, No Parsed Filename"
         q_dbhost_variant=2
         q_dbhost_menu=$(cat <<EOF
 
     C ) Custom Entered Hostname
-    E ) Environment Variable DB_HOST: '${DB_HOST}'
+    E ) Environment Variable DB${detected_host_num}_HOST: '${detected_host_value}'
 EOF
                         )
     fi
 
-    if [ -z "${DB_HOST}" ] && [ -n "${parsed_host}" ]; then
+    if [ -z "${detected_host_value}" ] && [ -n "${parsed_host}" ]; then
         print_debug "Parsed DBHost Variant: 3 - No Env, Parsed Filename"
         q_dbhost_variant=3
         q_dbhost_menu=$(cat <<EOF
@@ -141,13 +151,13 @@ EOF
                         )
     fi
 
-    if [ -n "${DB_HOST}" ] && [ -n "${parsed_host}" ]; then
+    if [ -n "${detected_host_value}" ] && [ -n "${parsed_host}" ]; then
         print_debug "Parsed DBHost Variant: 4 - Env, Parsed Filename"
         q_dbhost_variant=4
         q_dbhost_menu=$(cat <<EOF
 
     C ) Custom Entered Hostname
-    E ) Environment Variable DB_HOST: '${DB_HOST}'
+    E ) Environment Variable DB${detected_host_num}_HOST: '${detected_host_value}'
     F ) Parsed Filename Host: '${p_dbhost}'
 EOF
                         )
@@ -174,7 +184,7 @@ EOF
         ;;
         2 )
             while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E${cdgy}\)  : ${cwh}${coff}) " q_dbhost_menu
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E\*${cdgy}\)  : ${cwh}${coff}) " q_dbhost_menu
                 case "${q_dbhost_menu,,}" in
                     c* )
                         counter=1
@@ -188,7 +198,7 @@ EOF
                         break
                     ;;
                     e* | "" )
-                        r_dbhost=${DB_HOST}
+                        r_dbhost=${detected_host_value}
                         break
                     ;;
                     q*  )
@@ -200,7 +210,7 @@ EOF
         ;;
         3 )
             while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}F${cdgy}\) : ${cwh}${coff}) " q_dbhost_menu
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}F\*${cdgy}\) : ${cwh}${coff}) " q_dbhost_menu
                 case "${q_dbhost_menu,,}" in
                     c* )
                         counter=1
@@ -227,7 +237,7 @@ EOF
 
         4 )
             while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E${cdgy}\) \| \(${cwh}F${cdgy}\) : ${cwh}${coff}) " q_dbhost_menu
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E\*${cdgy}\) \| \(${cwh}F${cdgy}\) : ${cwh}${coff}) " q_dbhost_menu
                 case "${q_dbhost_menu,,}" in
                     c* )
                         counter=1
@@ -241,7 +251,7 @@ EOF
                         break
                     ;;
                     e* | "" )
-                        r_dbhost=${DB_HOST}
+                        r_dbhost=${detected_host_value}
                         break
                     ;;
                     f* )
@@ -258,6 +268,337 @@ EOF
     esac
 }
 
+get_dbname() {
+    p_dbname=$(basename -- "${r_filename}" | cut -d _ -f 2)
+
+    if [ -n "${p_dbname}" ]; then
+        parsed_name=true
+        print_debug "Parsed DBName: ${p_dbname}"
+    fi
+
+    if grep -q "^DB${detected_host_num}_NAME=${p_dbname}" "${restore_vars}" ; then
+        detected_name_value=$(grep -q "^DB${detected_host_num}_NAME=${p_dbname}" "${restore_vars}" | head -n1 | cut -d '=' -f 2)
+    fi
+
+    if [ -z "${detected_name_value}" ] && [ -z "${parsed_name}" ]; then
+        print_debug "Parsed DBName Variant: 1 - No Env, No Parsed Filename"
+        q_dbname_variant=1
+        q_dbname_menu=$(cat <<EOF
+
+EOF
+                        )
+    fi
+
+    if [ -n "${detected_name_value}" ] && [ -z "${parsed_name}" ]; then
+        print_debug "Parsed DBName Variant: 2 - Env, No Parsed Filename"
+        q_dbname_variant=2
+        q_dbname_menu=$(cat <<EOF
+
+    C ) Custom Entered Database Name
+    E ) Environment Variable DB${detected_host_num}_NAME: '${detected_name_value}'
+EOF
+                        )
+    fi
+
+    if [ -z "${detected_name_value}" ] && [ -n "${parsed_name}" ]; then
+        print_debug "Parsed DBName Variant: 3 - No Env, Parsed Filename"
+        q_dbname_variant=3
+        q_dbname_menu=$(cat <<EOF
+
+    C ) Custom Entered Database Name
+    F ) Parsed Filename DB Name: '${p_dbname}'
+EOF
+                        )
+    fi
+
+    if [ -n "${detected_name_value}" ] && [ -n "${parsed_name}" ]; then
+        print_debug "Parsed DBname Variant: 4 - Env, Parsed Filename"
+        q_dbname_variant=4
+        q_dbname_menu=$(cat <<EOF
+
+    C ) Custom Entered Database Name
+    E ) Environment Variable DB${detected_host_num}_NAME: '${detected_name_value}'
+    F ) Parsed Filename DB Name: '${p_dbname}'
+EOF
+                        )
+    fi
+
+    cat << EOF
+
+What Database Name do you want to restore to?
+${q_dbname_menu}
+    Q ) Quit
+
+EOF
+
+    case "${q_dbname_variant}" in
+        1 )
+            counter=1
+            q_dbname=" "
+            while [[ $q_dbname = *" "* ]];  do
+                if [ $counter -gt 1 ] ; then print_error "DB names can't have spaces in them, please re-enter." ; fi ;
+                read -e -p "$(echo -e ${clg}** ${cdgy}What DB Name do you want to restore to:\ ${coff})" q_dbname
+                (( counter+=1 ))
+            done
+            r_dbname=${q_dbname}
+        ;;
+        2 )
+            while true; do
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E\*${cdgy}\)  : ${cwh}${coff}) " q_dbname_menu
+                case "${q_dbname_menu,,}" in
+                    c* )
+                        counter=1
+                        q_dbname=" "
+                        while [[ $q_dbname = *" "* ]];  do
+                            if [ $counter -gt 1 ] ; then print_error "DB Names can't have spaces in them, please re-enter." ; fi ;
+                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB name do you want to restore to:\ ${coff})" q_dbname
+                            (( counter+=1 ))
+                        done
+                        r_dbname=${q_dbname}
+                        break
+                    ;;
+                    e* | "" )
+                        r_dbname=${detected_name_value}
+                        break
+                    ;;
+                    q*  )
+                        print_info "Quitting Script"
+                        exit 1
+                    ;;
+                esac
+            done
+        ;;
+        3 )
+            while true; do
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}F\*${cdgy}\) : ${cwh}${coff}) " q_dbname_menu
+                case "${q_dbname_menu,,}" in
+                    c* )
+                        counter=1
+                        q_dbname=" "
+                        while [[ $q_dbname = *" "* ]];  do
+                            if [ $counter -gt 1 ] ; then print_error "DB names can't have spaces in them, please re-enter." ; fi ;
+                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB name do you want to restore to:\ ${coff})" q_dbname
+                            (( counter+=1 ))
+                        done
+                        r_dbname=${q_dbname}
+                        break
+                    ;;
+                    f* | "" )
+                        r_dbname=${p_dbname}
+                        break
+                    ;;
+                    q* )
+                        print_info "Quitting Script"
+                        exit 1
+                    ;;
+                esac
+            done
+        ;;
+
+        4 )
+            while true; do
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E\*${cdgy}\) \| \(${cwh}F${cdgy}\) : ${cwh}${coff}) " q_dbname_menu
+                case "${q_dbname_menu,,}" in
+                    c* )
+                        counter=1
+                        q_dbname=" "
+                        while [[ $q_dbname = *" "* ]];  do
+                            if [ $counter -gt 1 ] ; then print_error "DB names can't have spaces in them, please re-enter." ; fi ;
+                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB name do you want to restore to:\ ${coff})" q_dbname
+                            (( counter+=1 ))
+                        done
+                        r_dbname=${q_dbname}
+                        break
+                    ;;
+                    e* | "" )
+                        r_dbname=${detected_name_value}
+                        break
+                    ;;
+                    f* )
+                        r_dbname=${p_dbname}
+                        break
+                    ;;
+                    q* )
+                        print_info "Quitting Script"
+                        exit 1
+                    ;;
+                esac
+            done
+        ;;
+    esac
+}
+
+get_dbpass() {
+    if grep -q "^DB${detected_host_num}_PASS=" "${restore_vars}" ; then
+        detected_pass_value=$(grep "^DB${detected_host_num}_PASS=" "${restore_vars}" | head -n1 | cut -d '=' -f 2)
+    fi
+
+    if [ -z "${detected_pass_value}" ] ; then
+        print_debug "Parsed DBPass Variant: 1 - No Env"
+        q_dbpass_variant=1
+        q_dbpass_menu=$(cat <<EOF
+
+EOF
+                        )
+    fi
+
+    if [ -n "${detected_pass_value}" ] ; then
+        print_debug "Parsed DBPass Variant: 2 - Env"
+        q_dbpass_variant=2
+        q_dbpass_menu=$(cat <<EOF
+
+    C ) Custom Entered Database Password
+    E ) Environment Variable DB${detected_host_num}_PASS
+EOF
+                        )
+    fi
+
+    cat << EOF
+
+What Database Password will be used to restore?
+${q_dbpass_menu}
+    Q ) Quit
+
+EOF
+
+    case "${q_dbpass_variant}" in
+        1 )
+            counter=1
+            q_dbpass=" "
+            while [[ $q_dbpass = *" "* ]];  do
+                if [ $counter -gt 1 ] ; then print_error "DB Passwords can't have spaces in them, please re-enter." ; fi ;
+                read -e -p "$(echo -e ${clg}** ${cdgy}What DB Password do you wish to use:\ ${coff})" q_dbpass
+                (( counter+=1 ))
+            done
+            r_dbpass=${q_dbpass}
+        ;;
+        2 )
+            while true; do
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E\*${cdgy}\)  : ${cwh}${coff}) " q_dbpass_menu
+                case "${q_dbpass_menu,,}" in
+                    c* )
+                        counter=1
+                        q_dbpass=" "
+                        while [[ $q_dbpass = *" "* ]];  do
+                            if [ $counter -gt 1 ] ; then print_error "DB Passwords can't have spaces in them, please re-enter." ; fi ;
+                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB Password do you wish to use:\ ${coff})" q_dbpass
+                            (( counter+=1 ))
+                        done
+                        r_dbpass=${q_dbpass}
+                        break
+                    ;;
+                    e* | "" )
+                        r_dbpass=${detected_pass_value}
+                        break
+                    ;;
+                    q*  )
+                        print_info "Quitting Script"
+                        exit 1
+                    ;;
+                esac
+            done
+        ;;
+    esac
+}
+
+get_dbport() {
+    if grep -q "^DB${detected_host_num}_PORT=" "${restore_vars}" ; then
+        detected_port_value=$(grep "^DB${detected_host_num}_PORT=" "${restore_vars}" | head -n1 | cut -d '=' -f 2)
+    fi
+
+    if [ -z "${detected_port_value}" ] ; then
+        print_debug "Parsed DBPort Variant: 1 - No Env"
+        q_dbport_variant=1
+        q_dbport_menu_opt_default="| (${cwh}D${cdgy}) * "
+        q_dbport_menu=$(cat <<EOF
+
+    C ) Custom Entered Database Port
+    D ) Default Port for Database type '${r_dbtype}': '${DEFAULT_PORT}'
+EOF
+                        )
+    fi
+
+    if [ -n "${detected_port_value}" ] ; then
+        print_debug "Parsed DBPort Variant: 2 - Env"
+        q_dbport_variant=2
+        q_dbport_menu=$(cat <<EOF
+
+    C ) Custom Entered Database Port
+    D ) Default Port for Database type '${r_dbtype}': '${DEFAULT_PORT}'
+    E ) Environment Variable DB${detected_host_num}_PORT: '${detected_port_value}'
+EOF
+                        )
+    fi
+
+    cat << EOF
+
+What Database Port do you wish to use? MySQL/MariaDB typcially listens on port 3306. Postrgresql port 5432. MongoDB 27017
+${q_dbport_menu}
+    Q ) Quit
+
+EOF
+
+    case "${q_dbport_variant}" in
+        1 )
+            while true; do
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}D\*${cdgy}\) : ${cwh}${coff}) " q_dbport_menu
+                case "${q_dbport_menu,,}" in
+                    c* )
+                        counter=1
+                        q_dbport=" "
+                        q_dbportre='^[0-9]+$'
+                        while ! [[ $q_dbport =~ ${q_dbportre} ]];  do
+                            if [ $counter -gt 1 ] ; then print_error "Must be a port number, please re-enter." ; fi ;
+                                read -e -p "$(echo -e ${clg}** ${cdgy}What DB Port do you want to use:\ ${coff})" q_dbport
+                                (( counter+=1 ))
+                        done
+                        r_dbport=${q_dbport}
+                        break
+                    ;;
+                    d* | "" )
+                        r_dbport=${DEFAULT_PORT}
+                        break
+                    ;;
+                    q*  )
+                        print_info "Quitting Script"
+                        exit 1
+                    ;;
+                esac
+            done
+        ;;
+        2 )
+            while true; do
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}D${cdgy}\) \| \(${cwh}E\*${cdgy}\) : ${cwh}${coff}) " q_dbport_menu
+                case "${q_dbport_menu,,}" in
+                    c* )
+                        counter=1
+                        q_dbport=" "
+                        q_dbportre='^[0-9]+$'
+                        while ! [[ $q_dbport =~ ${q_dbportre} ]];  do
+                            if [ $counter -gt 1 ] ; then print_error "Must be a port number, please re-enter." ; fi ;
+                                read -e -p "$(echo -e ${clg}** ${cdgy}What DB Port do you want to use:\ ${coff})" q_dbport
+                                (( counter+=1 ))
+                        done
+                        r_dbport=${q_dbport}
+                        break
+                    ;;
+                    d* )
+                        r_dbport=${DEFAULT_PORT}
+                        break
+                    ;;
+                    e* | "" )
+                        r_dbport=${detected_port_value}
+                        break
+                    ;;
+                    q*  )
+                        print_info "Quitting Script"
+                        exit 1
+                    ;;
+                esac
+            done
+        ;;
+    esac
+}
 
 get_dbtype() {
     p_dbtype=$(basename -- "${r_filename}" | cut -d _ -f 1)
@@ -265,14 +606,17 @@ get_dbtype() {
     case "${p_dbtype}" in
         mongo* )
             parsed_type=true
+            DEFAULT_PORT=${DEFAULT_PORT:-"27017"}
             print_debug "Parsed DBType: MongoDB"
         ;;
         mariadb | mysql )
             parsed_type=true
+            DEFAULT_PORT=${DEFAULT_PORT:-"3306"}
             print_debug "Parsed DBType: MariaDB/MySQL"
         ;;
         pgsql | postgres* )
             parsed_type=true
+            DEFAULT_PORT=${DEFAULT_PORT:-"5432"}
             print_debug "Parsed DBType: Postgresql"
         ;;
         * )
@@ -339,14 +683,17 @@ EOF
                 case "${q_dbtype,,}" in
                     m* )
                         r_dbtype=mysql
+                        DEFAULT_PORT=${DEFAULT_PORT:-"3306"}
                         break
                     ;;
                     o* )
                         r_dbtype=mongo
+                        DEFAULT_PORT=${DEFAULT_PORT:-"27017"}
                         break
                     ;;
                     p* )
                         r_dbtype=postgresql
+                        DEFAULT_PORT=${DEFAULT_PORT:-"5432"}
                         break
                     ;;
                     q* )
@@ -366,14 +713,17 @@ EOF
                     ;;
                     m* )
                         r_dbtype=mysql
+                        DEFAULT_PORT=${DEFAULT_PORT:-"3306"}
                         break
                     ;;
                     o* )
                         r_dbtype=mongo
+                        DEFAULT_PORT=${DEFAULT_PORT:-"27017"}
                         break
                     ;;
                     p* )
                         r_dbtype=postgresql
+                        DEFAULT_PORT=${DEFAULT_PORT:-"5432"}
                         break
                     ;;
                     q* )
@@ -385,22 +735,36 @@ EOF
         ;;
         3 )
             while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}F${cdgy}\) \| \(${cwh}M${cdgy}\) \| \(${cwh}O${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
+                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}F${cdgy}\) \(Default\) \| \(${cwh}M${cdgy}\) \| \(${cwh}O${cdgy}\) \| \(${cwh}P${cdgy}\) : ${cwh}${coff}) " q_dbtype
                 case "${q_dbtype,,}" in
                     f* | "" )
                         r_dbtype=${p_dbtype}
+                        case "${r_dbtype}" in
+                            mongo )
+                                DEFAULT_PORT=${DEFAULT_PORT:-"27017"}
+                            ;;
+                            mysql )
+                                DEFAULT_PORT=${DEFAULT_PORT:-"3306"}
+                            ;;
+                            pgsql )
+                                DEFAULT_PORT=${DEFAULT_PORT:-"5432"}
+                            ;;
+                        esac
                         break
                     ;;
                     m* )
                         r_dbtype=mysql
+                        DEFAULT_PORT=${DEFAULT_PORT:-"3306"}
                         break
                     ;;
                     o* )
                         r_dbtype=mongo
+                        DEFAULT_PORT=${DEFAULT_PORT:-"27017"}
                         break
                     ;;
                     p* )
                         r_dbtype=postgresql
+                        DEFAULT_PORT=${DEFAULT_PORT:-"5432"}
                         break
                     ;;
                     q* )
@@ -425,14 +789,17 @@ EOF
                     ;;
                     m* )
                         r_dbtype=mysql
+                        DEFAULT_PORT=${DEFAULT_PORT:-"3306"}
                         break
                     ;;
                     o* )
                         r_dbtype=mongo
+                        DEFAULT_PORT=${DEFAULT_PORT:-"27017"}
                         break
                     ;;
                     p* )
                         r_dbtype=postgresql
+                        DEFAULT_PORT=${DEFAULT_PORT:-"5432"}
                         break
                     ;;
                     q* )
@@ -445,235 +812,12 @@ EOF
     esac
 }
 
-get_dbname() {
-    p_dbname=$(basename -- "${r_filename}" | cut -d _ -f 2)
-
-    if [ -n "${p_dbname}" ]; then
-        parsed_name=true
-        print_debug "Parsed DBName: ${p_dbhost}"
-    fi
-
-    if [ -z "${DB_NAME}" ] && [ -z "${parsed_name}" ]; then
-        print_debug "Parsed DBName Variant: 1 - No Env, No Parsed Filename"
-        q_dbname_variant=1
-        q_dbname_menu=$(cat <<EOF
-
-EOF
-                        )
-    fi
-
-    if [ -n "${DB_NAME}" ] && [ -z "${parsed_name}" ]; then
-        print_debug "Parsed DBName Variant: 2 - Env, No Parsed Filename"
-        q_dbname_variant=2
-        q_dbname_menu=$(cat <<EOF
-
-    C ) Custom Entered Database Name
-    E ) Environment Variable DB_NAME: '${DB_NAME}'
-EOF
-                        )
-    fi
-
-    if [ -z "${DB_NAME}" ] && [ -n "${parsed_name}" ]; then
-        print_debug "Parsed DBName Variant: 3 - No Env, Parsed Filename"
-        q_dbname_variant=3
-        q_dbname_menu=$(cat <<EOF
-
-    C ) Custom Entered Database Name
-    F ) Parsed Filename DB Name: '${p_dbname}'
-EOF
-                        )
-    fi
-
-    if [ -n "${DB_NAME}" ] && [ -n "${parsed_name}" ]; then
-        print_debug "Parsed DBname Variant: 4 - Env, Parsed Filename"
-        q_dbname_variant=4
-        q_dbname_menu=$(cat <<EOF
-
-    C ) Custom Entered Database Name
-    E ) Environment Variable DB_NAME: '${DB_NAME}'
-    F ) Parsed Filename DB Name: '${p_dbname}'
-EOF
-                        )
-    fi
-
-    cat << EOF
-
-What Database Name do you want to restore to?
-${q_dbname_menu}
-    Q ) Quit
-
-EOF
-
-    case "${q_dbname_variant}" in
-        1 )
-            counter=1
-            q_dbname=" "
-            while [[ $q_dbname = *" "* ]];  do
-                if [ $counter -gt 1 ] ; then print_error "DB names can't have spaces in them, please re-enter." ; fi ;
-                read -e -p "$(echo -e ${clg}** ${cdgy}What DB Name do you want to restore to:\ ${coff})" q_dbname
-                (( counter+=1 ))
-            done
-            r_dbname=${q_dbname}
-        ;;
-        2 )
-            while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E${cdgy}\)  : ${cwh}${coff}) " q_dbname_menu
-                case "${q_dbname_menu,,}" in
-                    c* )
-                        counter=1
-                        q_dbname=" "
-                        while [[ $q_dbname = *" "* ]];  do
-                            if [ $counter -gt 1 ] ; then print_error "DB Names can't have spaces in them, please re-enter." ; fi ;
-                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB name do you want to restore to:\ ${coff})" q_dbname
-                            (( counter+=1 ))
-                        done
-                        r_dbname=${q_dbname}
-                        break
-                    ;;
-                    e* | "" )
-                        r_dbname=${DB_NAME}
-                        break
-                    ;;
-                    q*  )
-                        print_info "Quitting Script"
-                        exit 1
-                    ;;
-                esac
-            done
-        ;;
-        3 )
-            while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}F${cdgy}\) : ${cwh}${coff}) " q_dbname_menu
-                case "${q_dbname_menu,,}" in
-                    c* )
-                        counter=1
-                        q_dbname=" "
-                        while [[ $q_dbname = *" "* ]];  do
-                            if [ $counter -gt 1 ] ; then print_error "DB names can't have spaces in them, please re-enter." ; fi ;
-                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB name do you want to restore to:\ ${coff})" q_dbname
-                            (( counter+=1 ))
-                        done
-                        r_dbname=${q_dbname}
-                        break
-                    ;;
-                    f* | "" )
-                        r_dbname=${p_dbname}
-                        break
-                    ;;
-                    q* )
-                        print_info "Quitting Script"
-                        exit 1
-                    ;;
-                esac
-            done
-        ;;
-
-        4 )
-            while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E${cdgy}\) \| \(${cwh}F${cdgy}\) : ${cwh}${coff}) " q_dbname_menu
-                case "${q_dbname_menu,,}" in
-                    c* )
-                        counter=1
-                        q_dbname=" "
-                        while [[ $q_dbname = *" "* ]];  do
-                            if [ $counter -gt 1 ] ; then print_error "DB names can't have spaces in them, please re-enter." ; fi ;
-                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB name do you want to restore to:\ ${coff})" q_dbname
-                            (( counter+=1 ))
-                        done
-                        r_dbname=${q_dbname}
-                        break
-                    ;;
-                    e* | "" )
-                        r_dbname=${DB_NAME}
-                        break
-                    ;;
-                    f* )
-                        r_dbname=${p_dbname}
-                        break
-                    ;;
-                    q* )
-                        print_info "Quitting Script"
-                        exit 1
-                    ;;
-                esac
-            done
-        ;;
-    esac
-}
-
-get_dbport() {
-    if [ -z "${DB_PORT}" ] ; then
-        print_debug "Parsed DBPort Variant: 1 - No Env"
-        q_dbport_variant=1
-        q_dbport_menu=$(cat <<EOF
-
-EOF
-                        )
-    fi
-
-    if [ -n "${DB_PORT}" ] ; then
-        print_debug "Parsed DBPort Variant: 2 - Env"
-        q_dbport_variant=2
-        q_dbport_menu=$(cat <<EOF
-
-    C ) Custom Entered Database Port
-    E ) Environment Variable DB_PORT: '${DB_PORT}'
-EOF
-                        )
-    fi
-
-    cat << EOF
-
-What Database Port do you wish to use? MySQL/MariaDB typcially listens on port 3306. Postrgresql port 5432. MongoDB 27017
-${q_dbport_menu}
-    Q ) Quit
-
-EOF
-
-    case "${q_dbport_variant}" in
-        1 )
-            counter=1
-            q_dbport=" "
-            q_dbportre='^[0-9]+$'
-            while ! [[ $q_dbport =~ ${q_dbportre} ]];  do
-                if [ $counter -gt 1 ] ; then print_error "Must be a port number, please re-enter." ; fi ;
-                    read -e -p "$(echo -e ${clg}** ${cdgy}What DB Port do you want to use:\ ${coff})" q_dbport
-                    (( counter+=1 ))
-            done
-            r_dbport=${q_dbport}
-        ;;
-        2 )
-            while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E${cdgy}\)  : ${cwh}${coff}) " q_dbport_menu
-                case "${q_dbport_menu,,}" in
-                    c* )
-                        counter=1
-                        q_dbport=" "
-                        q_dbportre='^[0-9]+$'
-                        while ! [[ $q_dbport =~ ${q_dbportre} ]];  do
-                            if [ $counter -gt 1 ] ; then print_error "Must be a port number, please re-enter." ; fi ;
-                                read -e -p "$(echo -e ${clg}** ${cdgy}What DB Port do you want to use:\ ${coff})" q_dbport
-                                (( counter+=1 ))
-                        done
-                        r_dbport=${q_dbport}
-                        break
-                    ;;
-                    e* | "" )
-                        r_dbport=${DB_PORT}
-                        break
-                    ;;
-                    q*  )
-                        print_info "Quitting Script"
-                        exit 1
-                    ;;
-                esac
-            done
-        ;;
-    esac
-}
-
 get_dbuser() {
-    if [ -z "${DB_USER}" ] ; then
+    if grep -q "^DB${detected_host_num}_USER=" "${restore_vars}" ; then
+        detected_user_value=$(grep "^DB${detected_host_num}_USER=" "${restore_vars}" | head -n1 | cut -d '=' -f 2)
+    fi
+
+    if [ -z "${detected_user_value}" ] ; then
         print_debug "Parsed DBUser Variant: 1 - No Env"
         q_dbuser_variant=1
         q_dbuser_menu=$(cat <<EOF
@@ -682,13 +826,13 @@ EOF
                         )
     fi
 
-    if [ -n "${DB_USER}" ] ; then
+    if [ -n "${detected_user_value}" ] ; then
         print_debug "Parsed DBUser Variant: 2 - Env"
         q_dbuser_variant=2
         q_dbuser_menu=$(cat <<EOF
 
     C ) Custom Entered Database User
-    E ) Environment Variable DB_USER: '${DB_USER}'
+    E ) Environment Variable DB${detected_host_num}_USER: '${detected_user_value}'
 EOF
                         )
     fi
@@ -728,7 +872,7 @@ EOF
                         break
                     ;;
                     e* | "" )
-                        r_dbuser=${DB_USER}
+                        r_dbuser=${detected_user_value}
                         break
                     ;;
                     q*  )
@@ -741,76 +885,37 @@ EOF
     esac
 }
 
-get_dbpass() {
-    if [ -z "${DB_PASS}" ] ; then
-        print_debug "Parsed DBPass Variant: 1 - No Env"
-        q_dbpass_variant=1
-        q_dbpass_menu=$(cat <<EOF
-
-EOF
-                        )
-    fi
-
-    if [ -n "${DB_PASS}" ] ; then
-        print_debug "Parsed DBPass Variant: 2 - Env"
-        q_dbpass_variant=2
-        q_dbpass_menu=$(cat <<EOF
-
-    C ) Custom Entered Database Password
-    E ) Environment Variable DB_PASS
-EOF
-                        )
-    fi
-
-    cat << EOF
-
-What Database Password will be used to restore?
-${q_dbpass_menu}
-    Q ) Quit
-
-EOF
-
-    case "${q_dbpass_variant}" in
-        1 )
-            counter=1
-            q_dbpass=" "
-            while [[ $q_dbpass = *" "* ]];  do
-                if [ $counter -gt 1 ] ; then print_error "DB Passwords can't have spaces in them, please re-enter." ; fi ;
-                read -e -p "$(echo -e ${clg}** ${cdgy}What DB Password do you wish to use:\ ${coff})" q_dbpass
-                (( counter+=1 ))
+get_filename() {
+    COLUMNS=12
+    prompt="Please select a file to restore:"
+    options=( $(find "${DEFAULT_FILESYSTEM_PATH}" -type f -maxdepth 2  -not -name '*.md5' -not -name '*.sha1' -not -name '*.gpg' -print0 | sort -z | xargs -0) )
+    PS3="$prompt "
+    select opt in "${options[@]}" "Custom" "Quit" ; do
+        if (( REPLY == 2 + ${#options[@]} )) ; then
+            echo "Bye!"
+            exit 2
+        elif (( REPLY == 1 + ${#options[@]} )) ; then
+            while [ ! -f "${opt}" ] ; do
+                read -p "What path and filename to restore: " opt
+                if [ ! -f "${opt}" ] ; then
+                print_error "File not found. Please retry.."
+                fi
             done
-            r_dbpass=${q_dbpass}
-        ;;
-        2 )
-            while true; do
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E${cdgy}\)  : ${cwh}${coff}) " q_dbpass_menu
-                case "${q_dbpass_menu,,}" in
-                    c* )
-                        counter=1
-                        q_dbpass=" "
-                        while [[ $q_dbpass = *" "* ]];  do
-                            if [ $counter -gt 1 ] ; then print_error "DB Passwords can't have spaces in them, please re-enter." ; fi ;
-                            read -e -p "$(echo -e ${clg}** ${cdgy}What DB Password do you wish to use:\ ${coff})" q_dbpass
-                            (( counter+=1 ))
-                        done
-                        r_dbpass=${q_dbpass}
-                        break
-                    ;;
-                    e* | "" )
-                        r_dbpass=${DB_PASS}
-                        break
-                    ;;
-                    q*  )
-                        print_info "Quitting Script"
-                        exit 1
-                    ;;
-                esac
-            done
-        ;;
-    esac
+            break
+        elif (( REPLY > 0 && REPLY <= ${#options[@]} )) ; then
+            break
+        else
+            echo "Invalid option. Try another one."
+        fi
+    done
+    COLUMNS=$oldcolumns
+    r_filename=${opt}
 }
 
 #### SCRIPT START
+trap control_c INT
+bootstrap_variables restore_init
+
 cat << EOF
 
 ## ${IMAGE_NAME} Restore Script

zabbix_templates/db_backup.json

@@ -1,10 +1,9 @@
 {
     "zabbix_export": {
-        "version": "6.0",
-        "date": "2022-03-18T13:32:12Z",
-        "groups": [
+        "version": "6.4",
+        "template_groups": [
             {
-                "uuid": "fa56524b5dbb4ec09d9777a6f7ccfbe4",
+                "uuid": "10b88d2b3a3a4c72b43bdce9310e1162",
                 "name": "DB/Backup"
             },
             {
@@ -14,10 +13,10 @@
         ],
         "templates": [
             {
-                "uuid": "5fc64d517afb4cc5bc09a3ef58b43ef7",
-                "template": "DB Backup",
-                "name": "DB Backup",
-                "description": "Template for Docker DB Backup Image\n\nMeant for use specifically with https://github.com/tiredofit/docker-db-backup\nLast tested with version 3.0.2",
+                "uuid": "5a16c1bd694145389eed5ee803d954cc",
+                "template": "DB Backup4",
+                "name": "DB Backup4",
+                "description": "Template for Docker DB Backup Image\n\nMeant for use specifically with https://github.com/tiredofit/docker-db-backup Version > 4.0.0\n\nSupports auto discovery of backup jobs and creates graphs and triggers",
                 "groups": [
                     {
                         "name": "DB/Backup"
@@ -26,134 +25,260 @@
                         "name": "Templates/Databases"
                     }
                 ],
-                "items": [
+                "discovery_rules": [
                     {
-                        "uuid": "72fd00fa2dd24e479f5affe03e8711d8",
-                        "name": "DB Backup: Backup Duration",
+                        "uuid": "94bb6f862e1841f8b2834b04c41c1d86",
+                        "name": "Backup",
                         "type": "TRAP",
-                        "key": "dbbackup.backup_duration",
+                        "key": "dbbackup.backup",
                         "delay": "0",
-                        "history": "7d",
-                        "units": "uptime",
-                        "description": "How long the backup took",
-                        "tags": [
+                        "item_prototypes": [
                             {
-                                "tag": "Application",
-                                "value": "DB Backup"
-                            }
-                        ]
-                    },
-                    {
-                        "uuid": "3549a2c9d56849babc6dc3c855484c1e",
-                        "name": "DB Backup: Backup Time",
-                        "type": "TRAP",
-                        "key": "dbbackup.datetime",
-                        "delay": "0",
-                        "history": "7d",
-                        "units": "unixtime",
-                        "request_method": "POST",
-                        "tags": [
+                                "uuid": "5a2c4d1cacf844829bc1fbf912e071c5",
+                                "name": "[{#NAME}] Checksum - Duration",
+                                "type": "TRAP",
+                                "key": "dbbackup.backup.checksum.duration.[{#NAME}]",
+                                "delay": "0",
+                                "history": "7d",
+                                "units": "uptime",
+                                "tags": [
+                                    {
+                                        "tag": "Application",
+                                        "value": "DB Backup"
+                                    }
+                                ]
+                            },
                             {
-                                "tag": "Application",
-                                "value": "DB Backup"
+                                "uuid": "6e49769ec07344a4974b13dab00c3539",
+                                "name": "[{#NAME}] Checksum - Hash",
+                                "type": "TRAP",
+                                "key": "dbbackup.backup.checksum.hash.[{#NAME}]",
+                                "delay": "0",
+                                "history": "30d",
+                                "trends": "0",
+                                "value_type": "TEXT",
+                                "tags": [
+                                    {
+                                        "tag": "Application",
+                                        "value": "DB Backup"
+                                    }
+                                ]
+                            },
+                            {
+                                "uuid": "bb6472e30bff4d9c908b1d34b893e622",
+                                "name": "[{#NAME}] Backup - Last Backup",
+                                "type": "TRAP",
+                                "key": "dbbackup.backup.datetime.[{#NAME}]",
+                                "delay": "0",
+                                "history": "7d",
+                                "units": "unixtime",
+                                "description": "Datestamp of last database backup",
+                                "tags": [
+                                    {
+                                        "tag": "Application",
+                                        "value": "DB Backup"
+                                    }
+                                ],
+                                "trigger_prototypes": [
+                                    {
+                                        "uuid": "3681b56bb882466fb304a48b4beb15f0",
+                                        "expression": "fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],172800s)=0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],259200s)<>0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],345600s)<>0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],432800s)<>0",
+                                        "name": "[{#NAME}] No backups detected in 2 days",
+                                        "priority": "HIGH",
+                                        "manual_close": "YES"
+                                    },
+                                    {
+                                        "uuid": "6c70136c84994197b6396a143b4e956f",
+                                        "expression": "fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],172800s)<>0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],259200s)=0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],345600s)<>0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],432800s)<>0",
+                                        "name": "[{#NAME}] No backups detected in 3 days",
+                                        "priority": "DISASTER",
+                                        "manual_close": "YES"
+                                    },
+                                    {
+                                        "uuid": "d2038025cab643019cb9610c301f0cb9",
+                                        "expression": "fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],172800s)<>0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],259200s)<>0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],345600s)=0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],432800s)<>0",
+                                        "name": "[{#NAME}] No backups detected in 4 days",
+                                        "priority": "DISASTER",
+                                        "manual_close": "YES"
+                                    },
+                                    {
+                                        "uuid": "ea85f02d032c4a1dbc1b6e91a3b2b37b",
+                                        "expression": "fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],172800s)<>0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],259200s)<>0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],345600s)<>0 and fuzzytime(/DB Backup4/dbbackup.backup.datetime.[{#NAME}],432800s)=0",
+                                        "name": "[{#NAME}] No backups detected in 5 days",
+                                        "priority": "DISASTER",
+                                        "manual_close": "YES"
+                                    }
+                                ]
+                            },
+                            {
+                                "uuid": "8ec2b2f44ddf4f36b3dbb2aa15e3a32f",
+                                "name": "[{#NAME}] Backup - Duration",
+                                "type": "TRAP",
+                                "key": "dbbackup.backup.duration.[{#NAME}]",
+                                "delay": "0",
+                                "history": "7d",
+                                "units": "uptime",
+                                "description": "How long the DB Backup job took",
+                                "tags": [
+                                    {
+                                        "tag": "Application",
+                                        "value": "DB Backup"
+                                    }
+                                ]
+                            },
+                            {
+                                "uuid": "3f0dc3c75261447c93482815c3d69524",
+                                "name": "[{#NAME}] Encrypt - Duration",
+                                "type": "TRAP",
+                                "key": "dbbackup.backup.encrypt.duration.[{#NAME}]",
+                                "delay": "0",
+                                "history": "7d",
+                                "units": "uptime",
+                                "tags": [
+                                    {
+                                        "tag": "Application",
+                                        "value": "DB Backup"
+                                    }
+                                ]
+                            },
+                            {
+                                "uuid": "c3d5ad0789c443859d6a673e03db9cec",
+                                "name": "[{#NAME}] Backup - Filename",
+                                "type": "TRAP",
+                                "key": "dbbackup.backup.filename.[{#NAME}]",
+                                "delay": "0",
+                                "history": "30d",
+                                "trends": "0",
+                                "value_type": "TEXT",
+                                "tags": [
+                                    {
+                                        "tag": "Application",
+                                        "value": "DB Backup"
+                                    }
+                                ]
+                            },
+                            {
+                                "uuid": "43b700c03897465eb7e49bbfe8fc9fc5",
+                                "name": "[{#NAME}] Backup - Size",
+                                "type": "TRAP",
+                                "key": "dbbackup.backup.size.[{#NAME}]",
+                                "delay": "0",
+                                "history": "7d",
+                                "description": "Backup Size",
+                                "tags": [
+                                    {
+                                        "tag": "Application",
+                                        "value": "DB Backup"
+                                    }
+                                ],
+                                "trigger_prototypes": [
+                                    {
+                                        "uuid": "849f8660bee04427aff55af47b6f509c",
+                                        "expression": "last(/DB Backup4/dbbackup.backup.size.[{#NAME}])/last(/DB Backup4/dbbackup.backup.size.[{#NAME}],#2)>1.2",
+                                        "name": "[{#NAME}] Backup 20% Greater in size",
+                                        "priority": "WARNING",
+                                        "manual_close": "YES"
+                                    },
+                                    {
+                                        "uuid": "74d16a7680544c65af22cc568ce3d59d",
+                                        "expression": "last(/DB Backup4/dbbackup.backup.size.[{#NAME}])/last(/DB Backup4/dbbackup.backup.size.[{#NAME}],#2)<0.2",
+                                        "name": "[{#NAME}]  Backup 20% Smaller in Size",
+                                        "priority": "WARNING",
+                                        "manual_close": "YES"
+                                    },
+                                    {
+                                        "uuid": "5595d769c73f4eaeadda95c84c2c0f17",
+                                        "expression": "last(/DB Backup4/dbbackup.backup.size.[{#NAME}])<1K",
+                                        "name": "[{#NAME}] Backup Empty",
+                                        "priority": "HIGH",
+                                        "manual_close": "YES"
+                                    }
+                                ]
+                            },
+                            {
+                                "uuid": "a6fc542a565c4baba8429ed9ab31b5ae",
+                                "name": "[{#NAME}] Backup - Status",
+                                "type": "TRAP",
+                                "key": "dbbackup.backup.status.[{#NAME}]",
+                                "delay": "0",
+                                "history": "7d",
+                                "description": "Maps exit code by DB Backup procedure",
+                                "valuemap": {
+                                    "name": "Backup Status"
+                                },
+                                "tags": [
+                                    {
+                                        "tag": "Application",
+                                        "value": "DB Backup"
+                                    }
+                                ],
+                                "trigger_prototypes": [
+                                    {
+                                        "uuid": "74b91e28453b4c2a84743f5e371495c1",
+                                        "expression": "last(/DB Backup4/dbbackup.backup.status.[{#NAME}])=1",
+                                        "name": "[{#NAME}] Backup - Failed with errors",
+                                        "priority": "WARNING",
+                                        "manual_close": "YES"
+                                    }
+                                ]
                             }
                         ],
-                        "triggers": [
+                        "graph_prototypes": [
                             {
-                                "uuid": "3ac1e074ffea46eb8002c9c08a85e7b4",
-                                "expression": "nodata(/DB Backup/dbbackup.datetime,2d)=1",
-                                "name": "DB-Backup: No backups detected in 2 days",
-                                "priority": "DISASTER",
-                                "manual_close": "YES"
+                                "uuid": "b5e8e9fe0c474fedba2b06366234afdf",
+                                "name": "[{#NAME}] Backup Duration",
+                                "graph_items": [
+                                    {
+                                        "color": "199C0D",
+                                        "calc_fnc": "ALL",
+                                        "item": {
+                                            "host": "DB Backup4",
+                                            "key": "dbbackup.backup.duration.[{#NAME}]"
+                                        }
+                                    }
+                                ]
                             },
                             {
-                                "uuid": "b8b5933dfa1a488c9c37dd7f4784c1ff",
-                                "expression": "fuzzytime(/DB Backup/dbbackup.datetime,172800s)=0 and fuzzytime(/DB Backup/dbbackup.datetime,259200s)<>0 and fuzzytime(/DB Backup/dbbackup.datetime,345600s)<>0 and fuzzytime(/DB Backup/dbbackup.datetime,432800s)<>0",
-                                "name": "DB Backup: No Backups occurred in 2 days",
-                                "priority": "AVERAGE"
+                                "uuid": "99b5deb4e28f40059c50846c7be2ef26",
+                                "name": "[{#NAME}] Backup Size",
+                                "graph_items": [
+                                    {
+                                        "color": "199C0D",
+                                        "calc_fnc": "ALL",
+                                        "item": {
+                                            "host": "DB Backup4",
+                                            "key": "dbbackup.backup.size.[{#NAME}]"
+                                        }
+                                    }
+                                ]
                             },
                             {
-                                "uuid": "35c5f420d0e142cc9601bae38decdc40",
-                                "expression": "fuzzytime(/DB Backup/dbbackup.datetime,172800s)<>0 and fuzzytime(/DB Backup/dbbackup.datetime,259200s)=0 and fuzzytime(/DB Backup/dbbackup.datetime,345600s)<>0 and fuzzytime(/DB Backup/dbbackup.datetime,432800s)<>0",
-                                "name": "DB Backup: No Backups occurred in 3 days",
-                                "priority": "AVERAGE"
+                                "uuid": "8c641e33659e4c8b866da64e252cfc2a",
+                                "name": "[{#NAME}] Checksum Duration",
+                                "graph_items": [
+                                    {
+                                        "color": "199C0D",
+                                        "calc_fnc": "ALL",
+                                        "item": {
+                                            "host": "DB Backup4",
+                                            "key": "dbbackup.backup.checksum.duration.[{#NAME}]"
+                                        }
+                                    }
+                                ]
                             },
                             {
-                                "uuid": "03c3719d82c241e886a0383c7d908a77",
-                                "expression": "fuzzytime(/DB Backup/dbbackup.datetime,172800s)<>0 and fuzzytime(/DB Backup/dbbackup.datetime,259200s)<>0 and fuzzytime(/DB Backup/dbbackup.datetime,345600s)=0 and fuzzytime(/DB Backup/dbbackup.datetime,432800s)<>0",
-                                "name": "DB Backup: No Backups occurred in 4 days",
-                                "priority": "AVERAGE"
-                            },
-                            {
-                                "uuid": "1634a03e44964e42b7e0101f5f68499c",
-                                "expression": "fuzzytime(/DB Backup/dbbackup.datetime,172800s)<>0 and fuzzytime(/DB Backup/dbbackup.datetime,259200s)<>0 and fuzzytime(/DB Backup/dbbackup.datetime,345600s)<>0 and fuzzytime(/DB Backup/dbbackup.datetime,432800s)=0",
-                                "name": "DB Backup: No Backups occurred in 5 days or more",
-                                "priority": "HIGH"
-                            }
-                        ]
-                    },
-                    {
-                        "uuid": "467dfec952b34f5aa4cc890b4351b62d",
-                        "name": "DB Backup: Backup Size",
-                        "type": "TRAP",
-                        "key": "dbbackup.size",
-                        "delay": "0",
-                        "history": "7d",
-                        "units": "B",
-                        "request_method": "POST",
-                        "tags": [
-                            {
-                                "tag": "Application",
-                                "value": "DB Backup"
-                            }
-                        ],
-                        "triggers": [
-                            {
-                                "uuid": "a41eb49b8a3541afb6de247dca750e38",
-                                "expression": "last(/DB Backup/dbbackup.size)/last(/DB Backup/dbbackup.size,#2)>1.2",
-                                "name": "DB Backup: 20% Greater in Size",
-                                "priority": "WARNING",
-                                "manual_close": "YES"
-                            },
-                            {
-                                "uuid": "422f66be5049403293f3d96fc53f20cd",
-                                "expression": "last(/DB Backup/dbbackup.size)/last(/DB Backup/dbbackup.size,#2)<0.2",
-                                "name": "DB Backup: 20% Smaller in Size",
-                                "priority": "WARNING",
-                                "manual_close": "YES"
-                            },
-                            {
-                                "uuid": "d6d9d875b92f4d799d4bc89aabd4e90e",
-                                "expression": "last(/DB Backup/dbbackup.size)<1K",
-                                "name": "DB Backup: empty",
-                                "priority": "HIGH"
-                            }
-                        ]
-                    },
-                    {
-                        "uuid": "a6b13e8b46a64abab64a4d44d620d272",
-                        "name": "DB Backup: Last Backup Status",
-                        "type": "TRAP",
-                        "key": "dbbackup.status",
-                        "delay": "0",
-                        "history": "7d",
-                        "description": "Maps Exit Codes received by backup applications",
-                        "valuemap": {
-                            "name": "DB Backup Status"
-                        },
-                        "tags": [
-                            {
-                                "tag": "Application",
-                                "value": "DB Backup"
-                            }
-                        ],
-                        "triggers": [
-                            {
-                                "uuid": "23d71e356f96493180f02d4b84a79fd6",
-                                "expression": "last(/DB Backup/dbbackup.status)=1",
-                                "name": "DB Backup: Failed Backup Detected",
-                                "priority": "HIGH",
-                                "manual_close": "YES"
+                                "uuid": "65b8770f71ed4cff9111b82c42b17571",
+                                "name": "[{#NAME}] Encrypt Duration",
+                                "graph_items": [
+                                    {
+                                        "color": "199C0D",
+                                        "calc_fnc": "ALL",
+                                        "item": {
+                                            "host": "DB Backup4",
+                                            "key": "dbbackup.backup.encrypt.duration.[{#NAME}]"
+                                        }
+                                    }
+                                ]
                             }
                         ]
                     }
@@ -168,38 +293,10 @@
                         "value": "Database"
                     }
                 ],
-                "dashboards": [
-                    {
-                        "uuid": "90c81bb47184401ca9663626784a6f30",
-                        "name": "DB Backup",
-                        "pages": [
-                            {
-                                "widgets": [
-                                    {
-                                        "type": "GRAPH_CLASSIC",
-                                        "name": "Backup Size",
-                                        "width": "23",
-                                        "height": "5",
-                                        "fields": [
-                                            {
-                                                "type": "GRAPH",
-                                                "name": "graphid",
-                                                "value": {
-                                                    "name": "DB Backup: Backup Size",
-                                                    "host": "DB Backup"
-                                                }
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ],
                 "valuemaps": [
                     {
-                        "uuid": "82f3a3d01b3c42b8942b59d2363724e0",
-                        "name": "DB Backup Status",
+                        "uuid": "92a87279388b4fd1ac51c1e417e1776e",
+                        "name": "Backup Status",
                         "mappings": [
                             {
                                 "value": "0",
@@ -214,36 +311,6 @@
                     }
                 ]
             }
-        ],
-        "graphs": [
-            {
-                "uuid": "6e02c200b76046bab76062cd1ab086b2",
-                "name": "DB Backup: Backup Duration",
-                "graph_items": [
-                    {
-                        "color": "199C0D",
-                        "item": {
-                            "host": "DB Backup",
-                            "key": "dbbackup.backup_duration"
-                        }
-                    }
-                ]
-            },
-            {
-                "uuid": "b881ee18f05c4f4c835982c9dfbb55d6",
-                "name": "DB Backup: Backup Size",
-                "type": "STACKED",
-                "graph_items": [
-                    {
-                        "sortorder": "1",
-                        "color": "1A7C11",
-                        "item": {
-                            "host": "DB Backup",
-                            "key": "dbbackup.size"
-                        }
-                    }
-                ]
-            }
         ]
     }
 }