yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-03 17:59:31 +02:00
Code Issues Releases Wiki Activity

Update p1_pgsql and mysql to support Unix Domain Socket (#3716)

Browse source
This commit is contained in:
Badlop 2024-05-13 12:38:19 +02:00
parent d04f92d44e
commit 1b81af00b2
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mix.exs
View file

@ -174,8 +174,8 @@ defmodule Ejabberd.MixProject do
{if_version_below(~c"27", true), {:jiffy, "~> 1.1.1"}}, {if_version_below(~c"27", true), {:jiffy, "~> 1.1.1"}},
{if_version_below(~c"22", true), {:lager, "~> 3.9.1"}}, {if_version_below(~c"22", true), {:lager, "~> 3.9.1"}},
{config(:lua), {:luerl, "~> 1.2.0"}}, {config(:lua), {:luerl, "~> 1.2.0"}},
{config(:mysql), {:p1_mysql, ">= 1.0.23" }}, {config(:mysql), {:p1_mysql, git: "https://github.com/processone/p1_mysql" }},
{config(:pgsql), {:p1_pgsql, "~> 1.1"}}, {config(:pgsql), {:p1_pgsql, git: "https://github.com/processone/p1_pgsql"}},
{config(:sqlite), {:sqlite3, "~> 1.1"}}, {config(:sqlite), {:sqlite3, "~> 1.1"}},
{config(:stun), {:stun, "~> 1.0"}}], do: {config(:stun), {:stun, "~> 1.0"}}], do:
dep dep

4
rebar.config
View file

@ -58,10 +58,10 @@
{mqtree, "~> 1.0.16", {git, "https://github.com/processone/mqtree", {tag, "1.0.16"}}}, {mqtree, "~> 1.0.16", {git, "https://github.com/processone/mqtree", {tag, "1.0.16"}}},
{p1_acme, ".*", {git, "https://github.com/processone/p1_acme", {branch, "master"}}}, {p1_acme, ".*", {git, "https://github.com/processone/p1_acme", {branch, "master"}}},
{if_var_true, mysql, {if_var_true, mysql,
{p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {tag, "1.0.23"}}}}, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {branch, "master"}}}},
{p1_oauth2, "~> 0.6.14", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.14"}}}, {p1_oauth2, "~> 0.6.14", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.14"}}},
{if_var_true, pgsql, {if_var_true, pgsql,
{p1_pgsql, "~> 1.1.15", {git, "https://github.com/processone/p1_pgsql", {tag, "1.1.25"}}}}, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {branch, "master"}}}},
{p1_utils, "~> 1.0.25", {git, "https://github.com/processone/p1_utils", {tag, "1.0.25"}}}, {p1_utils, "~> 1.0.25", {git, "https://github.com/processone/p1_utils", {tag, "1.0.25"}}},
{pkix, ".*", {git, "https://github.com/processone/pkix", {branch, "master"}}}, {pkix, ".*", {git, "https://github.com/processone/pkix", {branch, "master"}}},
{if_var_true, sqlite, {if_var_true, sqlite,

6
src/ejabberd_options_doc.erl
View file

@ -1378,11 +1378,13 @@ doc() ->
"The default value is the value defined in _`queue_type`_ " "The default value is the value defined in _`queue_type`_ "
"or 'ram' if the latter is not set.")}}, "or 'ram' if the latter is not set.")}},
{sql_server, {sql_server,
#{value => ?T("Host"), #{value => "Host | IP Address | ODBC Connection String | Unix Socket Path",
note => "improved in 23.04", note => "improved in 24.xx",
desc => desc =>
?T("The hostname or IP address of the SQL server. For _`sql_type`_ " ?T("The hostname or IP address of the SQL server. For _`sql_type`_ "
"'mssql' or 'odbc' this can also be an ODBC connection string. " "'mssql' or 'odbc' this can also be an ODBC connection string. "
"When _`sql_type`_ is 'mysql' or 'pgsql', this can be the path to "
"a unix domain socket expressed like: \"unix:/path/to/socket\"."
"The default value is 'localhost'.")}}, "The default value is 'localhost'.")}},
{sql_ssl, {sql_ssl,
#{value => "true | false", #{value => "true | false",