diff --git a/mix.exs b/mix.exs index c58496ce5..c592422f2 100644 --- a/mix.exs +++ b/mix.exs @@ -174,8 +174,8 @@ defmodule Ejabberd.MixProject do {if_version_below(~c"27", true), {:jiffy, "~> 1.1.1"}}, {if_version_below(~c"22", true), {:lager, "~> 3.9.1"}}, {config(:lua), {:luerl, "~> 1.2.0"}}, - {config(:mysql), {:p1_mysql, ">= 1.0.23" }}, - {config(:pgsql), {:p1_pgsql, "~> 1.1"}}, + {config(:mysql), {:p1_mysql, git: "https://github.com/processone/p1_mysql" }}, + {config(:pgsql), {:p1_pgsql, git: "https://github.com/processone/p1_pgsql"}}, {config(:sqlite), {:sqlite3, "~> 1.1"}}, {config(:stun), {:stun, "~> 1.0"}}], do: dep diff --git a/rebar.config b/rebar.config index 6119d0298..5d63df68a 100644 --- a/rebar.config +++ b/rebar.config @@ -58,10 +58,10 @@ {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"}}}, {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"}}}, {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"}}}, {pkix, ".*", {git, "https://github.com/processone/pkix", {branch, "master"}}}, {if_var_true, sqlite, diff --git a/src/ejabberd_options_doc.erl b/src/ejabberd_options_doc.erl index 5bb1b3b9b..bd80461c0 100644 --- a/src/ejabberd_options_doc.erl +++ b/src/ejabberd_options_doc.erl @@ -1378,11 +1378,13 @@ doc() -> "The default value is the value defined in _`queue_type`_ " "or 'ram' if the latter is not set.")}}, {sql_server, - #{value => ?T("Host"), - note => "improved in 23.04", + #{value => "Host | IP Address | ODBC Connection String | Unix Socket Path", + note => "improved in 24.xx", desc => ?T("The hostname or IP address of the SQL server. For _`sql_type`_ " "'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'.")}}, {sql_ssl, #{value => "true | false",