diff --git a/.github/workflows/main.yml b/.github/workflows/image_build.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/workflows/image_build.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index d99279c..05a94a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 4.9.1 2026-08-06 + + ### Changed + - Fix issue with MySQL pre backup connectivity check when ssl disabled + + ## 4.9.0 2026-07-29 The db-backup:4.9.x series will be the last before the 5.x.x release which is expected in August of 2026. diff --git a/README.md b/README.md index f463bf4..85372e2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Backup multiple types of database servers on a scheduled basis with many customi * CouchDB, InfluxDB, MySQL/MariaDB, Microsoft SQL, MongoDB, Postgres, Redis, SQLite3 support * Dump to local filesystem or backup to S3 Compatible services, and Azure -* Multiple backup job support (DB01, DB02, ... DB99) +* Multiple backup job support (DB01, DB02, DB03) - Up to DB99 for supporters. * Flexible scheduling (interval, cron, HHMM, datetime) * Blackout periods to skip backups during certain hours * Per-job credentials, storage targets, compression, encryption @@ -439,7 +439,10 @@ If for some reason your filesystem or host is not detecting it right, use the en #### Job Backup Options If `DEFAULT_` variables are set and you do not wish for the settings to carry over into your jobs, you can set the appropriate environment variable with the value of `unset`. -Otherwise, override them per backup job. Additional backup jobs can be scheduled by using `DB02_`,`DB03_`,`DB04_` ... prefixes. A limit of 3 can be created when not in advanced mode. See [Specific Database Options](#specific-database-options) which may overrule this list. +Otherwise, override them per backup job. Additional backup jobs can be scheduled by using `DB02_`,`DB03_`,`DB04_` ... prefixes. + +A limit of 3 can be created when not in advanced mode. + | Parameter | Description | Default | `_FILE` | Adv. | | ----------- | ---------------------------------------------------------------------------------------------- | ------- | ------- | ---- | diff --git a/container-db-backup b/container-db-backup deleted file mode 160000 index e3b7a96..0000000 --- a/container-db-backup +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e3b7a96131a094d88de4e01589e4f78e3df8eae7 diff --git a/rootfs/container/functions/10-dbbackup b/rootfs/container/functions/10-dbbackup index 9bb9717..efa2049 100644 --- a/rootfs/container/functions/10-dbbackup +++ b/rootfs/container/functions/10-dbbackup @@ -343,7 +343,14 @@ EOF mysql_tls_args="${mysql_tls_args} --tls_version=${backup_job_mysql_tls_version}" fi else - mysql_tls_args="--skip-ssl" + case "${backup_job_mysql_client,,}" in + mariadb ) + mysql_tls_args="--skip-ssl" + ;; + mysql ) + mysql_tls_args="--ssl-mode=DISABLED" + ;; + esac fi ;; "mssql" | "microsoftsql" ) @@ -655,9 +662,9 @@ dbbackup_backup_pgsql() { print_notice "Dumping PostgresSQL globals: with 'pg_dumpall -g' ${compression_string}" if var_true "${DEBUG_BACKUP_PGSQL}" ; then dbbackup_debug on; fi dbbackup_run_as_user ${play_fair} pg_dumpall -h "${backup_job_db_host}" -U "${backup_job_db_user}" -p "${backup_job_db_port}" -g ${backup_job_extra_opts} ${backup_job_extra_backup_opts} | ${compress_cmd} | dbbackup_run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null - exit_code=$? + exit_code=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2])) if var_true "${DEBUG_BACKUP_PGSQL}" ; then dbbackup_debug off; fi - dbbackup_check_exit_code "${backup_job_filename}" + dbbackup_check_exit_code backup "${backup_job_filename}" dbbackup_timer backup finish dbbackup_file_encryption dbbackup_generate_checksum @@ -1634,7 +1641,7 @@ EOZP if [ -n "${zabbix_checksum_time}" ] ; then echo "${zabbix_checksum_time}" | silent dbbackup_run_as_user tee -a "${zabbix_payload}" ; fi if [ -n "${zabbix_encrypt_time}" ] ; then echo "${zabbix_encrypt_time}" | silent dbbackup_run_as_user tee -a "${zabbix_payload}" ; fi - silent dbbackup_run_as_user zabbix_sender -c "${ZABBIX_CONFIG_PATH}"/"${ZABBIX_CONFIG_FILE}" -i "${zabbix_payload}" + silent dbbackup_run_as_user zabbix_sender -c "${ZABBIX_CONFIG_PATH}"/"${ZABBIX_CONFIG_FILE}" -i "${zabbix_payload}" if [ "$?" != "0" ] ; then dbbackup_write_log error "Error sending statistics, consider disabling with 'CONTAINER_ENABLE_MONITORING=FALSE'" ; fi unset zabbix_checksum_time