IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove default-authentication-plugin config due to obsolescence

Browse Source
This commit is contained in:
Evgeniy Antonyuk 2024-05-08 16:31:27 +03:00
parent 8c63ceb70a
commit 2ae938697c
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install/common/product-configuration
View File

@ -446,14 +446,9 @@ change_mysql_config(){
else
sed "s/collation_server.*/collation_server = utf8_general_ci/" -i ${CNF_PATH} || true # ignore errors
fi
MYSQL_AUTHENTICATION_PLUGIN=$($MYSQL -e "SHOW VARIABLES LIKE 'default_authentication_plugin';" -s | awk '{print $2}' >/dev/null 2>&1)
MYSQL_AUTHENTICATION_PLUGIN=${MYSQL_AUTHENTICATION_PLUGIN:-caching_sha2_password}
if ! grep -q "^default-authentication-plugin" ${CNF_PATH}; then
sed "/\[mysqld\]/a default-authentication-plugin = ${MYSQL_AUTHENTICATION_PLUGIN}" -i ${CNF_PATH}
else
sed "s/default-authentication-plugin.*/default-authentication-plugin = ${MYSQL_AUTHENTICATION_PLUGIN}/" -i ${CNF_PATH} || true # ignore errors
if grep -q "^default-authentication-plugin" ${CNF_PATH}; then
sed "/^default-authentication-plugin/d" -i "${CNF_PATH}" || true # ignore errors
fi
if [ -e ${CNF_SERVICE_PATH} ]; then

1
install/docker/db.yml
View File

@ -1,7 +1,6 @@
services:
onlyoffice-mysql-server:
image: ${MYSQL_IMAGE}
command: --default-authentication-plugin=caching_sha2_password
cap_add:
- SYS_NICE
container_name: ${MYSQL_CONTAINER_NAME}