From 2c898e359b4a969492f9bb655cffd8ab6ec4448d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 4 Feb 2022 18:32:45 +0000 Subject: [PATCH] mantis 8966: add SllMode=None also to robust mysql connectionstring example. Change text a bit as sugested. Thanks --- bin/Robust.HG.ini.example | 4 +++- bin/Robust.ini.example | 5 +++-- bin/config-include/GridCommon.ini.example | 11 +++++++---- bin/config-include/StandaloneCommon.ini.example | 12 +++++++----- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index d05208fea6..eb1a1a5fac 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -234,8 +234,10 @@ ; MySQL ; Uncomment these lines if you want to use MySQL storage ; Change the connection string to your db details + ; If using MySQL 8.0.4 or later, check that default-authentication-plugin=mysql_native_password + ; rather than caching_sha2_password is set in /etc/mysql/mysql.conf.d/mysqld.cnf (not applicable to MariaDB). StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;SslMode=None;" ; * As an example, the below configuration precisely mimicks the legacy diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 7964dc9611..ee50dbf5e4 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -190,9 +190,10 @@ ; MySQL ; Uncomment these lines if you want to use MySQL storage ; Change the connection string to your db details + ; If using MySQL 8.0.4 or later, check that default-authentication-plugin=mysql_native_password + ; rather than caching_sha2_password is set in /etc/mysql/mysql.conf.d/mysqld.cnf (not applicable to MariaDB). StorageProvider = "OpenSim.Data.MySQL.dll" - ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;" - + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;SslMode=None;" ; * As an example, the below configuration precisely mimicks the legacy ; * asset server. It is read by the asset IN connector (defined above) diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 90eaab1b7c..63bb88cc6b 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -8,13 +8,16 @@ ; SQLite Include-Storage = "config-include/storage/SQLiteStandalone.ini"; - ; MySql - ; Uncomment these lines if you want to use mysql storage + ; MySQL + ; Uncomment these lines if you want to use MySQL storage ; Change the connection string to your db details - ; Remove SslMode=None if you need secure connection to the local mysql - ; In most cases ssl is just a pure waste of resources, specially when mySql is on same machine, and closed to outside + ; Remove SslMode=None if you need secure connection to the local MySQL + ; In most cases ssl is just a pure waste of resources, specially when MySQL is on same machine, and closed to outside ;StorageProvider = "OpenSim.Data.MySQL.dll" + ; If using MySQL 8.0.4 or later, check that default-authentication-plugin=mysql_native_password + ; rather than caching_sha2_password is set in /etc/mysql/mysql.conf.d/mysqld.cnf (not applicable to MariaDB). ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;SslMode=None;" + ; Uncomment this line if you are using MySQL and want to use a different database for estates ; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database. ; Most people won't need to do this so only uncomment if you know what you're doing. diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 517edd5af7..5d22ed6d15 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -8,11 +8,13 @@ ; SQLite Include-Storage = "config-include/storage/SQLiteStandalone.ini"; - ; MySql - ; Uncomment these lines if you want to use mysql storage - ; Change the connection string to your db detail - ; Remove SslMode=None if you need secure connection to the local mysql - ; In most cases ssl is just a pure waste of resources, specially when mySql is on same machine, and closed to outside + ; MySQL + ; Uncomment these lines if you want to use MySQL storage + ; Change the connection string to your db details + ; Remove SslMode=None if you need secure connection to the local MySQL + ; In most cases ssl is just a pure waste of resources, specially when MySQL is on same machine, and closed to outside + ; If using MySQL 8.0.4 or later, check that default-authentication-plugin=mysql_native_password + rather than caching_sha2_password is set in /etc/mysql/mysql.conf.d/mysqld.cnf (not applicable to MariaDB). ;StorageProvider = "OpenSim.Data.MySQL.dll" ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;SslMode=None;"