Skip to content

Commit fd1d950

Browse files
committed
Release 3.9.1 - See CHANGELOG.md
1 parent 7befba0 commit fd1d950

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 3.9.1 2023-05-03 <dave at tiredofit dot ca>
2+
3+
### Changed
4+
- Properly allow multiple _FILE environment variables to execute solving an issue with MySQL backups
5+
- Fix _FILE functionality for DB_NAME variable
6+
7+
18
## 3.9.0 2023-04-26 <dave at tiredofit dot ca>
29

310
### Added

install/assets/functions/10-db-backup

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ bootstrap_variables() {
44
sanity_var DB_TYPE "Set appropriate DB_TYPE"
55
transform_file_var \
66
DB_HOST \
7+
DB_NAME \
78
DB_PORT \
89
DB_USER \
910
DB_PASS
11+
1012
case "${DB_TYPE,,}" in
1113
couch* )
1214
dbtype=couch
@@ -52,7 +54,8 @@ bootstrap_variables() {
5254
dbtype=mysql
5355
DB_PORT=${DB_PORT:-3306}
5456
sanity_var DB_NAME "Database Name to backup. Multiple seperated by commas"
55-
[[ ( -n "${DB_PASS}" ) ]] && export MYSQL_PWD=${DB_PASS}
57+
transform_file_var DB_PASS
58+
if [ -n "${DB_PASS}" ] ; then export MYSQL_PWD=${DB_PASS} ; fi
5659
if var_true "${MYSQL_ENABLE_TLS}" ; then
5760
if [ -n "${MYSQL_TLS_CA_FILE}" ] ; then
5861
mysql_tls_args="--ssl_ca=${MYSQL_TLS_CA_FILE}"
@@ -445,6 +448,7 @@ check_availability() {
445448
;;
446449
"mysql" )
447450
counter=0
451+
transform_file_var DB_PASS
448452
export MYSQL_PWD=${DB_PASS}
449453
while ! (mysqladmin -u"${DB_USER}" -P"${DB_PORT}" -h"${DB_HOST}" ${mysql_tls_args} status > /dev/null 2>&1) ; do
450454
sleep 5

0 commit comments

Comments
 (0)