Release 4.1.15 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,28 @@
+## 4.1.15 2025-01-29 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add support for username and password support when checking for connectivity to couchdb (credit: JvSomeren)
+
+   ### Changed
+      - Fix issue with couchdb compression routines
+
+
+## 4.1.14 2025-01-21 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Downgrade AWS Client to 1.36.40 due to incompatibilities with providers with 1.37x. for time being
+
+
+## 4.1.13 2025-01-21 <dave at tiredofit dot ca>
+
+   ### Added
+      - Update MySQL client to 8.4.4
+      - Update AWS Client to 1.37.2
+
+   ### Changed
+      - Seperate MySQL and MariaDB TLS Configurationf for arguments that have deviated
+
+
 ## 4.1.12 2024-12-13 <dave at tiredofit dot ca>
 
    ### Changed

Dockerfile

@@ -8,9 +8,9 @@ ENV INFLUX1_CLIENT_VERSION=1.8.0 \
     INFLUX2_CLIENT_VERSION=2.7.5 \
     MSODBC_VERSION=18.4.1.1-1 \
     MSSQL_VERSION=18.4.1.1-1 \
-    MYSQL_VERSION=mysql-8.4.3 \
+    MYSQL_VERSION=mysql-8.4.4 \
     MYSQL_REPO_URL=https://github.com/mysql/mysql-server \
-    AWS_CLI_VERSION=1.35.13 \
+    AWS_CLI_VERSION=1.36.40 \
     CONTAINER_ENABLE_MESSAGING=TRUE \
     CONTAINER_ENABLE_MONITORING=TRUE \
     IMAGE_NAME="tiredofit/db-backup" \

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 Dave Conroy
+Copyright (c) 2025 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

install/assets/functions/10-db-backup

@@ -429,6 +429,14 @@ EOF
 
                 if [ -n "${backup_job_db_pass}" ] ; then export MYSQL_PWD=${backup_job_db_pass} ; fi
                 if var_true "${backup_job_mysql_enable_tls}" ; then
+                    case "${backup_job_mysql_client,,}" in
+                        mariadb )
+                            mysql_tls_args="--ssl"
+                        ;;
+                        mysql )
+                            mysql_tls_args="--ssl-mode=REQUIRED"
+                        ;;
+                    esac
                     if [ -n "${backup_job_mysql_tls_ca_file}" ] ; then
                         mysql_tls_args="--ssl_ca=${backup_job_mysql_tls_ca_file}"
                     fi
@@ -440,14 +448,28 @@ EOF
                     fi
 
                     if var_true "${backup_job_mysql_tls_verify}" ; then
-                        mysql_tls_args="${mysql_tls_args} --sslverify-server-cert"
+                        case "${backup_job_mysql_client,,}" in
+                            mariadb )
+                                mysql_tls_args="${mysql_tls_args} --sslverify-server-cert"
+                            ;;
+                            mysql )
+                                mysql_tls_args="${mysql_tls_args} --ssl-mode=VERIFY_CA"
+                            ;;
+                        esac
                     fi
 
                     if [ -n "${backup_job_mysql_tls_version}" ] ; then
                         mysql_tls_args="${mysql_tls_args} --tls_version=${backup_job_mysql_tls_version}"
                     fi
                 else
-                    mysql_tls_args="--disable-ssl"
+                    case "${backup_job_mysql_client,,}" in
+                        mariadb )
+                            mysql_tls_args="--disable-ssl"
+                        ;;
+                        mysql )
+                            mysql_tls_args="--ssl-mode=DISABLED"
+                        ;;
+                    esac
                 fi
             ;;
             "mssql" | "microsoftsql" )
@@ -510,7 +532,7 @@ backup_couch() {
     prepare_dbbackup
     backup_job_filename=couch_${backup_job_db_name}_${backup_job_db_host#*//}_${now}.txt
     backup_job_filename_base=couch_${backup_job_db_name}_${backup_job_db_host#*//}
-    compressionzyclonite
+    compression
     if var_true "${DEBUG_BACKUP_COUCH}" ; then debug off; fi
     check_exit_code backup "${backup_job_filename}"
     timer backup finish
@@ -921,14 +943,16 @@ backup_sqlite3() {
 
 check_availability() {
     if var_true "${DEBUG_CHECK_AVAILABILITY}" ; then debug on; fi
-    ### Set the Database Type
     if var_false "${backup_job_skip_availability_check}" ; then
         case "${dbtype}" in
             "couch" )
                 counter=0
                 code_received=0
+                if [ -n "${backup_job_db_user}" ] && [ -n ${backup_job_db_pass} ]; then
+                    _ca_couch_auth="-u ${backup_job_db_user}:${backup_job_db_pass}"
+                fi
                 while [ "${code_received}" != "200" ]; do
-                    code_received=$(run_as_user curl -XGET -sSL -o /dev/null -L -w ''%{http_code}'' ${backup_job_db_host}:${backup_job_db_port})
+                    code_received=$(run_as_user curl -XGET -sSL -o /dev/null -L -w ''%{http_code}'' ${_ca_couch_auth} ${backup_job_db_host}:${backup_job_db_port})
                     if [ "${code_received}" = "200" ] ; then break ; fi
                     sleep 5
                     (( counter+=5 ))