Release 4.0.25 - See CHANGELOG.md

Update 10-db-backup msmtp -C

CHANGELOG.md

@@ -1,3 +1,170 @@
+## 4.0.25 2023-11-29 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix #297 - Add parameters to blobxfer to restore functionality
+
+
+## 4.0.24 2023-11-28 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix issue with cron parsing and 0 being a value getting clobbered by sort command
+
+
+## 4.0.23 2023-11-28 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Resolve issue with custom notification scripts not executing
+
+
+## 4.0.22 2023-11-25 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Move cleanup_old_data routines to happen within backup_ function to properly accomodate for globals, and ALL DB_NAME use cases
+
+
+## 4.0.21 2023-11-22 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix for SQLite backups not being cleaned up properly due to a malformed base
+
+
+## 4.0.20 2023-11-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Update base image to support S6 Overlay 3.1.6.2 to solve shutdown issues specifically with MODE=MANUAL and MANUAL_RUN_FOREVER=TRUE
+      - Add some safety nets for Manual scheduling
+
+
+## 4.0.19 2023-11-20 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Make adjustments to cron scheduling feature to be able to handle whitespace properly"
+
+
+## 4.0.18 2023-11-18 <joergmschulz@github>
+
+   ### Changed
+      - Fix loading msmtp configuration
+
+
+## 4.0.17 2023-11-17 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Provide more details when notifying via instant messages
+
+
+## 4.0.16 2023-11-17 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Switch to using msmtp instead of s-mail for notify()
+
+
+## 4.0.15 2023-11-16 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix cleanup of old backups
+
+
+## 4.0.14 2023-11-13 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Bugfix when PRE/POST scripts found not giving legacy warning
+      - Run pre / post scripts as root
+
+
+## 4.0.13 2023-11-12 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Check for any quotes if using MONGO_CUSTOM_URI and remove
+
+
+## 4.0.12 2023-11-12 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Allow creating schedulers if _MONGO_CUSTOM_URI is set and _DB_HOST blank
+
+
+## 4.0.11 2023-11-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Resolve issue with backing up ALL databases with PGSQL and MySQL
+
+
+## 4.0.10 2023-11-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Change environment variable parsing routines to properly accomodate for Passwords containing '=='
+
+
+## 4.0.9 2023-11-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Fix issue with quotes being wrapped around _PASS variables
+
+
+## 4.0.8 2023-11-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Tidy up file_encryption() routines
+      - Change environment variable _ENCRYPT_PUBKEY to _ENCRYPT_PUBLIC_KEY
+      - Add new environment variable _ENCRYPT_PRIVATE_KEY
+
+
+## 4.0.7 2023-11-11 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add seperate permissions for _FILESYSTEM_PATH
+
+   ### Changed
+      - More output and debugging additions
+      - SQLite3 now backs up without running into file permission/access problems
+      - Cleanup old sqlite backups from temp directory
+      - Handle multiple SQLite3 backups concurrently
+
+
+## 4.0.6 2023-11-10 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add additional DEBUG_ statements
+
+   ### Changed
+      - Fix issue with Influx DB not properly detecting the correct version
+
+
+## 4.0.5 2023-11-10 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add undocumented DBBACKUP_USER|GROUP environment variables for troubleshooting permissions
+      - Add more verbosity when using DEBUG_ statements
+
+   ### Changed
+      - Change _FILESYSTEM_PERMISSION to 600 from 700
+
+
+## 4.0.4 2023-11-09 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add support for restoring from different DB_ variables in restore script
+
+
+## 4.0.3 2023-11-09 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Resolve issue with _MYSQL_TLS_CERT_FILE not being read
+
+
+## 4.0.2 2023-11-09 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Properly use custom _S3_HOST variables
+
+
+## 4.0.1 2023-11-09 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Restore - Stop using DB_DUMP_TARGET and instead browse using DEFAULT_BACKUP_PATH
+
+
 ## 4.0.0 2023-11-08 <dave at tiredofit dot ca>
 
 This is the fourth major release to the DB Backup image which started as a basic MySQL backup service in early 2017. With each major release brings enhancements, bugfixes, removals along with breaking changes and this one is no different.

Dockerfile

@@ -10,7 +10,7 @@ ENV INFLUX1_CLIENT_VERSION=1.8.0 \
     MSODBC_VERSION=18.3.2.1-1 \
     MSSQL_VERSION=18.3.1.1-1 \
     AWS_CLI_VERSION=1.29.78 \
-    CONTAINER_ENABLE_MESSAGING=FALSE \
+    CONTAINER_ENABLE_MESSAGING=TRUE \
     CONTAINER_ENABLE_MONITORING=TRUE \
     IMAGE_NAME="tiredofit/db-backup" \
     IMAGE_REPO_URL="https://github.com/tiredofit/docker-db-backup/"
@@ -76,7 +76,7 @@ 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 [ $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/aws/aws-cli "${AWS_CLI_VERSION}" && \
     python3 setup.py install --prefix=/usr && \

README.md

@@ -212,12 +212,15 @@ If these are set and no other defaults or variables are set explicitly, they wil
 
 ##### Encryption Options
 
-| Variable                     | Description                                 | Default |
+Encryption occurs after compression and the encrypted filename will have a `.gpg` suffix
-| ---------------------------- | ------------------------------------------- | ------- |
+
-| `DEFAULT_ENCRYPT`            | Encrypt file after backing up with GPG      | `FALSE` |
+| Variable                      | Description                                  | Default | `_FILE` |
-| `DEFAULT_ENCRYPT_PASSPHRASE` | Passphrase to encrypt file with GPG         |         |
+| ----------------------------- | -------------------------------------------- | ------- | ------- |
-| *or*                         |                                             |         |
+| `DEFAULT_ENCRYPT`             | Encrypt file after backing up with GPG       | `FALSE` |         |
-| `DEFAULT_ENCRYPT_PUBKEY`     | Path of public key to encrypt file with GPG |         |
+| `DEFAULT_ENCRYPT_PASSPHRASE`  | Passphrase to encrypt file with GPG          |         | x       |
+| *or*                          |                                              |         |         |
+| `DEFAULT_ENCRYPT_PUBLIC_KEY`  | Path of public key to encrypt file with GPG  |         | x       |
+| `DEFAULT_ENCRYPT_PRIVATE_KEY` | Path of private key to encrypt file with GPG |         | x       |
 
 ##### Scheduling Options
 
@@ -229,7 +232,7 @@ If these are set and no other defaults or variables are set explicitly, they wil
 |                                 | Absolute HHMM, e.g. `2330` or `0415`                                                                                                           |         |
 |                                 | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half |         |
 |                                 | Full datestamp e.g. `2023-12-21 23:30:00`                                                                                                      |         |
-|                                 | Cron expression e.g. `30 23 * * *`  - [Understand the format](https://en.wikipedia.org/wiki/ Cron) - *BACKUP_INTERVAL is ignored*              |         |
+|                                 | Cron expression e.g. `30 23 * * *` [Understand the format](https://en.wikipedia.org/wiki/Cron) - *BACKUP_INTERVAL is ignored*                  |         |
 | `DEFAULT_CLEANUP_TIME`          | Value in minutes to delete old backups (only fired when backup interval executes)                                                              | `FALSE` |
 |                                 | 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything.                           |         |
 | `DEFAULT_ARCHIVE_TIME`          | Value in minutes to move all files files older than (x) from                                                                                   |         |
@@ -320,12 +323,13 @@ Options that are related to the value of `DEFAULT_BACKUP_LOCATION`
 
 If `DEFAULT_BACKUP_LOCTION` = `FILESYSTEM` then the following options are used:
 
-| Variable                          | Description                                                                                           | Default                               |
+| Variable                             | Description                                                                                           | Default                               |
-| --------------------------------- | ----------------------------------------------------------------------------------------------------- | ------------------------------------- |
+| ------------------------------------ | ----------------------------------------------------------------------------------------------------- | ------------------------------------- |
-| `DEFAULT_CREATE_LATEST_SYMLINK`   | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)` | `TRUE`                                |
+| `DEFAULT_CREATE_LATEST_SYMLINK`      | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)` | `TRUE`                                |
-| `DEFAULT_FILESYSTEM_PATH`         | Directory where the database dumps are kept.                                                          | `/backup`                             |
+| `DEFAULT_FILESYSTEM_PATH`            | Directory where the database dumps are kept.                                                          | `/backup`                             |
-| `DEFAULT_FILESYSTEM_ARCHIVE_PATH` | Optional Directory where the database dumps archives are kept                                         | `${DEFAULT_FILESYSTEM_PATH}/archive/` |
+| `DEFAULT_FILESYSTEM_PATH_PERMISSION` | Permissions to apply to backup directory                                                              | `700`                                 |
-| `DEFAULT_FILESYSTEM_PERMISSION`   | Directory and File permissions to apply to files.                                                     | `700`                                 |
+| `DEFAULT_FILESYSTEM_ARCHIVE_PATH`    | Optional Directory where the database dumps archives are kept                                         | `${DEFAULT_FILESYSTEM_PATH}/archive/` |
+| `DEFAULT_FILESYSTEM_PERMISSION`      | Permissions to apply to files.                                                                        | `600`                                 |
 
 ###### S3
 
@@ -390,11 +394,11 @@ echo "${1} Backup Starting on ${2} for ${3} at ${4}. Filename: ${5}"
 ```
 
     ## script DBXX_TYPE DBXX_HOST DBXX_NAME STARTEPOCH BACKUP_FILENAME
-    ${f} "${backup_job_db_type}" "${backup_job_db_host}" "${backup_job_db_name}" "${backup_routines_start_time}" "${target}"
+    ${f} "${backup_job_db_type}" "${backup_job_db_host}" "${backup_job_db_name}" "${backup_routines_start_time}" "${backup_job_file}"
 
 Outputs the following on the console:
 
-`mysql Backup Starting on example-db for example at 1647370800. Filename: mysql_example_example-db_202200315-000000.sql.bz2
+`mysql Backup Starting on example-db for example at 1647370800. Filename: mysql_example_example-db_202200315-000000.sql.bz2`
 
 ###### Post backup
 
@@ -421,7 +425,7 @@ echo "${1} ${2} Backup Completed on ${3} for ${4} on ${5} ending ${6} for a dura
 ```
 
       ## script EXIT_CODE DB_TYPE DB_HOST DB_NAME STARTEPOCH FINISHEPOCH DURATIONEPOCH BACKUP_FILENAME FILESIZE CHECKSUMVALUE
-      ${f} "${exit_code}" "${dbtype}" "${backup_job_db_host}" "${backup_job_db_name}" "${backup_routines_start_time}" "${backup_routines_finish_time}" "${backup_routines_total_time}" "${target}" "${FILESIZE}" "${checksum_value}" "${move_exit_code}
+      ${f} "${exit_code}" "${dbtype}" "${backup_job_db_host}" "${backup_job_db_name}" "${backup_routines_start_time}" "${backup_routines_finish_time}" "${backup_routines_total_time}" "${backup_job_file}" "${filesize}" "${checksum_value}" "${move_exit_code}
 
 Outputs the following on the console:
 
@@ -471,12 +475,16 @@ Otherwise, override them per backup job. Additional backup jobs can be scheduled
 
 ##### Encryption Options
 
-| Variable                  | Description                                 | Default |
+Encryption will occur after compression and the resulting filename will have a `.gpg` suffix
-| ------------------------- | ------------------------------------------- | ------- |
+
-| `DB01_ENCRYPT`            | Encrypt file after backing up with GPG      | `FALSE` |
+
-| `DB01_ENCRYPT_PASSPHRASE` | Passphrase to encrypt file with GPG         |         |
+| Variable                   | Description                                  | Default | `_FILE` |
-| *or*                      |                                             |         |
+| -------------------------- | -------------------------------------------- | ------- | ------- |
-| `DB01_ENCRYPT_PUBKEY`     | Path of public key to encrypt file with GPG |         |
+| `DB01_ENCRYPT`             | Encrypt file after backing up with GPG       | `FALSE` |         |
+| `DB01_ENCRYPT_PASSPHRASE`  | Passphrase to encrypt file with GPG          |         | x       |
+| *or*                       |                                              |         |         |
+| `DB01_ENCRYPT_PUBLIC_KEY`  | Path of public key to encrypt file with GPG  |         | x       |
+| `DB01_ENCRYPT_PRIVATE_KEY` | Path of private key to encrypt file with GPG |         | x       |
 
 ##### Scheduling Options
 
@@ -488,7 +496,7 @@ Otherwise, override them per backup job. Additional backup jobs can be scheduled
 |                              | Absolute HHMM, e.g. `2330` or `0415`                                                                                                           |         |
 |                              | Relative +MM, i.e. how many minutes after starting the container, e.g. `+0` (immediate), `+10` (in 10 minutes), or `+90` in an hour and a half |         |
 |                              | Full datestamp e.g. `2023-12-21 23:30:00`                                                                                                      |         |
-|                              | Cron expression e.g. `30 23 * * *`  - [Understand the format](https://en.wikipedia.org/wiki/ Cron) - *BACKUP_INTERVAL is ignored*              |         |
+|                              | Cron expression e.g. `30 23 * * *`  [Understand the format](https://en.wikipedia.org/wiki/Cron) - *BACKUP_INTERVAL is ignored*                 |         |
 | `DB01_CLEANUP_TIME`          | Value in minutes to delete old backups (only fired when backup interval executes)                                                              | `FALSE` |
 |                              | 1440 would delete anything above 1 day old. You don't need to set this variable if you want to hold onto everything.                           |         |
 | `DB01_ARCHIVE_TIME`          | Value in minutes to move all files files older than (x) from `DB01_BACKUP_FILESYSTEM_PATH`                                                     |         |
@@ -593,12 +601,13 @@ Options that are related to the value of `DB01_BACKUP_LOCATION`
 
 If `DB01_BACKUP_LOCTION` = `FILESYSTEM` then the following options are used:
 
-| Variable                       | Description                                                                                           | Default                           |
+| Variable                          | Description                                                                                           | Default                            |
-| ------------------------------ | ----------------------------------------------------------------------------------------------------- | --------------------------------- |
+| --------------------------------- | ----------------------------------------------------------------------------------------------------- | ---------------------------------- |
-| `DB01_CREATE_LATEST_SYMLINK`   | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)` | `TRUE`                            |
+| `DB01_CREATE_LATEST_SYMLINK`      | Create a symbolic link pointing to last backup in this format: `latest-(DB_TYPE)-(DB_NAME)-(DB_HOST)` | `TRUE`                             |
-| `DB01_FILESYSTEM_PATH`         | Directory where the database dumps are kept.                                                          | `/backup`                         |
+| `DB01_FILESYSTEM_PATH`            | Directory where the database dumps are kept.                                                          | `/backup`                          |
-| `DB01_FILESYSTEM_ARCHIVE_PATH` | Optional Directory where the database dumps archives are kept                                         | `${DB01_FILESYSTEM_PATH/archive/` |
+| `DB01_FILESYSTEM_PATH_PERMISSION` | Permissions to apply to backup directory                                                              | `700`                              |
-| `DB01_FILESYSTEM_PERMISSION`   | Directory and File permissions to apply to files.                                                     | `700`                             |
+| `DB01_FILESYSTEM_ARCHIVE_PATH`    | Optional Directory where the database dumps archives are kept                                         | `${DB01_FILESYSTEM_PATH}/archive/` |
+| `DB01_FILESYSTEM_PERMISSION`      | Directory and File permissions to apply to files.                                                     | `600`                              |
 
 ###### S3
 
@@ -630,7 +639,7 @@ If `DB01_BACKUP_LOCATION` = `blobxfer` then the following options are used:.
 | `DB01_BLOBXFER_STORAGE_ACCOUNT_KEY` | Microsoft Azure Cloud storage account key.  |                     | x       |
 | `DB01_BLOBXFER_REMOTE_PATH`         | Remote Azure path                           | `/docker-db-backup` | x       |
 
-> This service uploads files from backup target directory `DB01_BACKUP_FILESYSTEM_PATH`.
+> This service uploads files from backup directory `DB01_BACKUP_FILESYSTEM_PATH`.
 > If the a cleanup configuration in `DB01_CLEANUP_TIME` is defined, the remote directory on Azure storage will also be cleaned automatically.
 
 ##### Hooks
@@ -663,11 +672,11 @@ echo "${1} Backup Starting on ${2} for ${3} at ${4}. Filename: ${5}"
 ```
 
     ## script DB01_TYPE DB01_HOST DB01_NAME STARTEPOCH BACKUP_FILENAME
-    ${f} "${backup_job_db_type}" "${backup_job_db_host}" "${backup_job_db_name}" "${backup_routines_start_time}" "${target}"
+    ${f} "${backup_job_db_type}" "${backup_job_db_host}" "${backup_job_db_name}" "${backup_routines_start_time}" "${backup_job_filename}"
 
 Outputs the following on the console:
 
-`mysql Backup Starting on example-db for example at 1647370800. Filename: mysql_example_example-db_202200315-000000.sql.bz2
+`mysql Backup Starting on example-db for example at 1647370800. Filename: mysql_example_example-db_202200315-000000.sql.bz2`
 
 ###### Post backup
 
@@ -694,7 +703,7 @@ echo "${1} ${2} Backup Completed on ${3} for ${4} on ${5} ending ${6} for a dura
 ```
 
       ## script EXIT_CODE DB_TYPE DB_HOST DB_NAME STARTEPOCH FINISHEPOCH DURATIONEPOCH BACKUP_FILENAME FILESIZE CHECKSUMVALUE
-      ${f} "${exit_code}" "${dbtype}" "${dbhost}" "${dbname}" "${backup_routines_start_time}" "${backup_routines_finish_time}" "${backup_routines_total_time}" "${target}" "${FILESIZE}" "${checksum_value}" "${move_exit_code}
+      ${f} "${exit_code}" "${dbtype}" "${dbhost}" "${dbname}" "${backup_routines_start_time}" "${backup_routines_finish_time}" "${backup_routines_total_time}" "${backup_job_filename}" "${filesize}" "${checksum_value}" "${move_exit_code}
 
 Outputs the following on the console:
 
@@ -733,6 +742,9 @@ $5 body/error message
 
 
 ##### Email Notifications
+
+See more details in the base image listed above for more mail environment variables.
+
 | Parameter   | Description                                                                               | Default | `_FILE` |
 | ----------- | ----------------------------------------------------------------------------------------- | ------- | ------- |
 | `MAIL_FROM` | What email address to send mail from for errors                                           |         |         |

install/assets/dbbackup/template-dbbackup/run

@@ -8,12 +8,15 @@ source /assets/functions/10-db-backup
 source /assets/defaults/10-db-backup
 bootstrap_variables backup_init {{BACKUP_NUMBER}}
 bootstrap_variables parse_variables {{BACKUP_NUMBER}}
-PROCESS_NAME="{{BACKUP_NUMBER}}-${backup_job_db_host}__${backup_job_db_name}"
+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" ]] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then
+if [[ "${MODE,,}" =~ "standalone" ]] || [ "${MODE,,}" = "manual" ] || [ "${1,,}" = "manual" ] || [ "${1,,}" = "now" ]; then
     print_debug "Detected Manual Mode"
     persist=false
     backup_job_backup_begin=+0
@@ -31,9 +34,12 @@ else
     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"
         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
         print_error "_BACKUP_BEGIN is invalid - Unable to perform scheduling"

install/assets/defaults/10-db-backup

@@ -1,6 +1,8 @@
 #!/command/with-contenv bash
 
 BACKUP_JOB_CONCURRENCY=${BACKUP_JOB_CONCURRENCY:-"1"}
+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}
@@ -13,7 +15,8 @@ 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_PERMISSION=${DEFAULT_FILESYSTEM_PERMISSION:-"700"}
+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"}

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
@@ -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() {
+get_filename() {
-    if [ -z "${DB_PASS}" ] ; then
+    COLUMNS=12
-        print_debug "Parsed DBPass Variant: 1 - No Env"
+    prompt="Please select a file to restore:"
-        q_dbpass_variant=1
+    options=( $(find "${DEFAULT_FILESYSTEM_PATH}" -type f -maxdepth 2  -not -name '*.md5' -not -name '*.sha1' -not -name '*.gpg' -print0 | sort -z | xargs -0) )
-        q_dbpass_menu=$(cat <<EOF
+    PS3="$prompt "
-
+    select opt in "${options[@]}" "Custom" "Quit" ; do
-EOF
+        if (( REPLY == 2 + ${#options[@]} )) ; then
-                        )
+            echo "Bye!"
-    fi
+            exit 2
-
+        elif (( REPLY == 1 + ${#options[@]} )) ; then
-    if [ -n "${DB_PASS}" ] ; then
+            while [ ! -f "${opt}" ] ; do
-        print_debug "Parsed DBPass Variant: 2 - Env"
+                read -p "What path and filename to restore: " opt
-        q_dbpass_variant=2
+                if [ ! -f "${opt}" ] ; then
-        q_dbpass_menu=$(cat <<EOF
+                print_error "File not found. Please retry.."
-
+                fi
-    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 ))
             done
-            r_dbpass=${q_dbpass}
+            break
-        ;;
+        elif (( REPLY > 0 && REPLY <= ${#options[@]} )) ; then
-        2 )
+            break
-            while true; do
+        else
-                read -p "$(echo -e ${clg}** ${cdgy}Enter Value \(${cwh}C${cdgy}\) \| \(${cwh}E${cdgy}\)  : ${cwh}${coff}) " q_dbpass_menu
+            echo "Invalid option. Try another one."
-                case "${q_dbpass_menu,,}" in
+        fi
-                    c* )
+    done
-                        counter=1
+    COLUMNS=$oldcolumns
-                        q_dbpass=" "
+    r_filename=${opt}
-                        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
 }
 
 #### SCRIPT START
+trap control_c INT
+bootstrap_variables restore_init
+
 cat << EOF
 
 ## ${IMAGE_NAME} Restore Script