Lines 53-65
mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $kohaconfig )"
Link Here
|
53 |
mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )" |
53 |
mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )" |
54 |
mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )" |
54 |
mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )" |
55 |
mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )" |
55 |
mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )" |
56 |
|
56 |
mysqltls="$( xmlstarlet sel -t -v 'yazgfs/config/tls' $kohaconfig || true )" |
|
|
57 |
mysqlca="$( xmlstarlet sel -t -v 'yazgfs/config/ca' $kohaconfig || true )" |
58 |
mysqlcert="$( xmlstarlet sel -t -v 'yazgfs/config/cert' $kohaconfig || true )" |
59 |
mysqlkey="$( xmlstarlet sel -t -v 'yazgfs/config/key' $kohaconfig || true )" |
57 |
mysqltz="$( xmlstarlet sel -t -v 'yazgfs/config/timezone' $kohaconfig || true )" |
60 |
mysqltz="$( xmlstarlet sel -t -v 'yazgfs/config/timezone' $kohaconfig || true )" |
58 |
if [ "$mysqltz" != "" ] |
61 |
|
59 |
then |
62 |
set -- --host="$mysqlhost" "$@" |
60 |
mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" --init-command="SET time_zone='$mysqltz'" \ |
63 |
set -- --user="$mysqluser" "$@" |
61 |
"$mysqldb" "${@}" |
64 |
set -- --password="$mysqlpass" "$@" |
62 |
else |
65 |
|
63 |
mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" \ |
66 |
if [ "$mysqltls" = "yes" ]; then |
64 |
"$mysqldb" "${@}" |
67 |
set -- --ssl "$@" |
|
|
68 |
if [ -n "$mysqlca" ] && [ "$mysqlca" != "DB_TLS_CA_CERTIFICATE" ]; then |
69 |
set -- --ssl-ca="$mysqlca" "$@" |
70 |
fi |
71 |
if [ -n "$mysqlcert" ] && [ "$mysqlcert" != "__DB_TLS_CLIENT_CERTIFICATE__" ]; then |
72 |
set -- --ssl-cert="$mysqlcert" "$@" |
73 |
fi |
74 |
if [ -n "$mysqlkey" ] && [ "$mysqlkey" != "__DB_TLS_CLIENT_KEY__" ]; then |
75 |
set -- --ssl-key="$mysqlkey" "$@" |
76 |
fi |
65 |
fi |
77 |
fi |
66 |
- |
78 |
|
|
|
79 |
if [ "$mysqltz" != "" ]; then |
80 |
set -- --init-command="SET time_zone='$mysqltz'" "$@" |
81 |
fi |
82 |
|
83 |
mysql "$mysqldb" "$@" |