File tree Expand file tree Collapse file tree 4 files changed +28
-4
lines changed Expand file tree Collapse file tree 4 files changed +28
-4
lines changed Original file line number Diff line number Diff line change @@ -164,7 +164,13 @@ docker_init_database_dir() {
164
164
fi
165
165
mysql_note " Database files initialized"
166
166
167
- if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e " $DATADIR /server-key.pem" ]; then
167
+ local sslEnabled
168
+ if \
169
+ command -v mysql_ssl_rsa_setup > /dev/null \
170
+ && [ ! -e " $DATADIR /server-key.pem" ] \
171
+ && sslEnabled=" $( mysql_get_config ' ssl' " $@ " ) " \
172
+ && [ " $sslEnabled " = ' TRUE' ] \
173
+ ; then
168
174
# https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84
169
175
mysql_note " Initializing certificates"
170
176
mysql_ssl_rsa_setup --datadir=" $DATADIR "
Original file line number Diff line number Diff line change @@ -164,7 +164,13 @@ docker_init_database_dir() {
164
164
fi
165
165
mysql_note " Database files initialized"
166
166
167
- if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e " $DATADIR /server-key.pem" ]; then
167
+ local sslEnabled
168
+ if \
169
+ command -v mysql_ssl_rsa_setup > /dev/null \
170
+ && [ ! -e " $DATADIR /server-key.pem" ] \
171
+ && sslEnabled=" $( mysql_get_config ' ssl' " $@ " ) " \
172
+ && [ " $sslEnabled " = ' TRUE' ] \
173
+ ; then
168
174
# https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84
169
175
mysql_note " Initializing certificates"
170
176
mysql_ssl_rsa_setup --datadir=" $DATADIR "
Original file line number Diff line number Diff line change @@ -164,7 +164,13 @@ docker_init_database_dir() {
164
164
fi
165
165
mysql_note " Database files initialized"
166
166
167
- if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e " $DATADIR /server-key.pem" ]; then
167
+ local sslEnabled
168
+ if \
169
+ command -v mysql_ssl_rsa_setup > /dev/null \
170
+ && [ ! -e " $DATADIR /server-key.pem" ] \
171
+ && sslEnabled=" $( mysql_get_config ' ssl' " $@ " ) " \
172
+ && [ " $sslEnabled " = ' TRUE' ] \
173
+ ; then
168
174
# https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84
169
175
mysql_note " Initializing certificates"
170
176
mysql_ssl_rsa_setup --datadir=" $DATADIR "
Original file line number Diff line number Diff line change @@ -164,7 +164,13 @@ docker_init_database_dir() {
164
164
fi
165
165
mysql_note " Database files initialized"
166
166
167
- if command -v mysql_ssl_rsa_setup > /dev/null && [ ! -e " $DATADIR /server-key.pem" ]; then
167
+ local sslEnabled
168
+ if \
169
+ command -v mysql_ssl_rsa_setup > /dev/null \
170
+ && [ ! -e " $DATADIR /server-key.pem" ] \
171
+ && sslEnabled=" $( mysql_get_config ' ssl' " $@ " ) " \
172
+ && [ " $sslEnabled " = ' TRUE' ] \
173
+ ; then
168
174
# https://github.com/mysql/mysql-server/blob/23032807537d8dd8ee4ec1c4d40f0633cd4e12f9/packaging/deb-in/extra/mysql-systemd-start#L81-L84
169
175
mysql_note " Initializing certificates"
170
176
mysql_ssl_rsa_setup --datadir=" $DATADIR "
You can’t perform that action at this time.
0 commit comments