From 2ae938697c6365a22b6002bdfa9a076e8029edb3 Mon Sep 17 00:00:00 2001
From: Evgeniy Antonyuk <antonyuk.evgenyiy@onlyoffice.com>
Date: Wed, 8 May 2024 16:31:27 +0300
Subject: [PATCH] Remove default-authentication-plugin config due to
 obsolescence

---
 install/common/product-configuration | 9 ++-------
 install/docker/db.yml                | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/install/common/product-configuration b/install/common/product-configuration
index 20a834cdf0..3fb1051c93 100644
--- a/install/common/product-configuration
+++ b/install/common/product-configuration
@@ -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
diff --git a/install/docker/db.yml b/install/docker/db.yml
index 449ea73da6..c4d4f3afd5 100644
--- a/install/docker/db.yml
+++ b/install/docker/db.yml
@@ -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}