From a0599010ca1a4411127feec477bbab7b64b2ca61 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Thu, 8 Feb 2018 09:17:52 +0000
Subject: [PATCH] Use /etc/roundcube/my.cnf for mysql config, if present

---
 start.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/start.sh b/start.sh
index 7ff7e09..3d77d37 100755
--- a/start.sh
+++ b/start.sh
@@ -13,6 +13,12 @@ TARGET_DIR=/var/www/webmail
 # Name of the MySQL database to use.
 MYSQL_DB="ai_roundcube"
 
+# If ${CONFIG_DIR}/my.cnf exists, use it as a defaults file for mysql.
+MYSQL=mysql
+if [ -e "${CONFIG_DIR}/my.cnf" ]; then
+    MYSQL="${MYSQL} --defaults-file=${CONFIG_DIR}/my.cnf"
+fi
+
 die() {
     echo "ERROR: $*" >&2
     exit 1
@@ -46,9 +52,9 @@ cur_version=$(mysql -NBe 'select version from rc_version' ${MYSQL_DB} 2>/dev/nul
 # If cur_version is empty, it means that the database has not been
 # initialized yet.
 if [ -z "${cur_version}" ]; then
-    mysql ${MYSQL_DB} < ${TARGET_DIR}/SQL/mysql.initial.sql \
+    ${MYSQL} ${MYSQL_DB} < ${TARGET_DIR}/SQL/mysql.initial.sql \
         || die "could not load initial SQL schema to ${MYSQL_DB}"
-    mysql -e "create table rc_version (version text); insert into rc_version (version) values ('unknown')" ${MYSQL_DB} \
+    ${MYSQL} -e "create table rc_version (version text); insert into rc_version (version) values ('unknown')" ${MYSQL_DB} \
         || die "could not create rc_version table in ${MYSQL_DB}"
 fi
     
@@ -56,6 +62,6 @@ fi
 ${TARGET_DIR}/bin/update.sh -v ${cur_version} -y \
     || die "Roundcube update script failed"
 
-mysql -e "update rc_version set version='${RC_VERSION}'" ${MYSQL_DB}
+${MYSQL} -e "update rc_version set version='${RC_VERSION}'" ${MYSQL_DB}
 
 exit 0
-- 
GitLab