From 50f27233a96cb06267082e017eb3676be1a73b6d Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Mon, 19 Dec 2022 12:33:07 -0800 Subject: [PATCH] Release 3.7.2 - See CHANGELOG.md --- CHANGELOG.md | 6 ++++++ install/assets/defaults/10-db-backup | 2 +- install/assets/functions/10-db-backup | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6f52d4..839d953 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 3.7.2 2022-12-19 + + ### Changed + - Bugfix for 3.7.1 + + ## 3.7.1 2022-12-19 ### Changed diff --git a/install/assets/defaults/10-db-backup b/install/assets/defaults/10-db-backup index 398550e..07aca2d 100644 --- a/install/assets/defaults/10-db-backup +++ b/install/assets/defaults/10-db-backup @@ -16,7 +16,7 @@ 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_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)"} diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup index ea3a9b7..27bd20d 100644 --- a/install/assets/functions/10-db-backup +++ b/install/assets/functions/10-db-backup @@ -59,10 +59,12 @@ bootstrap_variables() { if [ -n "${MYSQL_TLS_KEY_FILE}" ] ; then mysql_tls_args="${mysql_tls_args} --ssl_key=${MYSQL_TLS_KEY_FILE}" fi + if var_true "${TLS_VERIFY}" ; then mysql_tls_args="${mysql_tls_args} --sslverify-server-cert" fi - if [ -n "${MYSQL_TLS_VERSION}" ; then + + if [ -n "${MYSQL_TLS_VERSION}" ] ; then mysql_tls_args="${mysql_tls_args} --tls_version=${MYSQL_TLS_VERSION}" fi fi