From 77e0ab24f43792855278d2824e15a44bbe4d63aa Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Fri, 24 Jan 2025 22:00:24 +0100 Subject: [PATCH 1/4] Change to MySQL socket Make socket the default connection method, and keep user/pass as an option. --- v3/server/conf/ovms_server.conf.default | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/v3/server/conf/ovms_server.conf.default b/v3/server/conf/ovms_server.conf.default index 2cc0526..7750c45 100644 --- a/v3/server/conf/ovms_server.conf.default +++ b/v3/server/conf/ovms_server.conf.default @@ -1,7 +1,11 @@ [db] -path=DBI:mysql:database=openvehicles;host=127.0.0.1 -user= -pass= +# connect with UNIX Socket [default] +path=DBI:mysql:database=openvehicles;mariadb_socket=/var/run/mysqld/mysqld.sock; +# uncomment to use user/pass instead of socket +#path=DBI:mysql:database=openvehicles;host=127.0.0.1 +#user= +#pass= + pw_encode=drupal_password($password) # example: salting with secret salt & sha256 hashing: From 3b99c0a6d6c40aae95f499d69d2e2ff24e43f238 Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Sat, 25 Jan 2025 18:38:41 +0100 Subject: [PATCH 2/4] change default --- v3/server/conf/ovms_server.conf.default | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/v3/server/conf/ovms_server.conf.default b/v3/server/conf/ovms_server.conf.default index 7750c45..a28a489 100644 --- a/v3/server/conf/ovms_server.conf.default +++ b/v3/server/conf/ovms_server.conf.default @@ -1,10 +1,11 @@ [db] -# connect with UNIX Socket [default] +path=DBI:mysql:database=openvehicles;host=127.0.0.1 +user= +pass= + +# uncommentto connect with UNIX Socket +# please note that you need to comment the rows above if this is used path=DBI:mysql:database=openvehicles;mariadb_socket=/var/run/mysqld/mysqld.sock; -# uncomment to use user/pass instead of socket -#path=DBI:mysql:database=openvehicles;host=127.0.0.1 -#user= -#pass= pw_encode=drupal_password($password) From 775ff9e9db649049e792c0cbf4fa44684bc2458b Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Sat, 25 Jan 2025 18:39:00 +0100 Subject: [PATCH 3/4] forgot to comment out --- v3/server/conf/ovms_server.conf.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/server/conf/ovms_server.conf.default b/v3/server/conf/ovms_server.conf.default index a28a489..27f50b3 100644 --- a/v3/server/conf/ovms_server.conf.default +++ b/v3/server/conf/ovms_server.conf.default @@ -5,7 +5,7 @@ pass= # uncommentto connect with UNIX Socket # please note that you need to comment the rows above if this is used -path=DBI:mysql:database=openvehicles;mariadb_socket=/var/run/mysqld/mysqld.sock; +# path=DBI:mysql:database=openvehicles;mariadb_socket=/var/run/mysqld/mysqld.sock; pw_encode=drupal_password($password) From 3ca609a58383d83d8eb7f7ee4e463a1c45aa9661 Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Sat, 25 Jan 2025 18:39:48 +0100 Subject: [PATCH 4/4] change to MariaDB for socket --- v3/server/conf/ovms_server.conf.default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v3/server/conf/ovms_server.conf.default b/v3/server/conf/ovms_server.conf.default index 27f50b3..ca7c4d1 100644 --- a/v3/server/conf/ovms_server.conf.default +++ b/v3/server/conf/ovms_server.conf.default @@ -3,9 +3,9 @@ path=DBI:mysql:database=openvehicles;host=127.0.0.1 user= pass= -# uncommentto connect with UNIX Socket +# uncommentto connect with UNIX Socket and MariaDB # please note that you need to comment the rows above if this is used -# path=DBI:mysql:database=openvehicles;mariadb_socket=/var/run/mysqld/mysqld.sock; +# path=DBI:MariaDB:database=openvehicles;mariadb_socket=/var/run/mysqld/mysqld.sock; pw_encode=drupal_password($password)