Skip to content

Commit 532459c

Browse files
committed
Result of running "make clean extract"
1 parent f690c7a commit 532459c

File tree

7 files changed

+296
-52
lines changed

7 files changed

+296
-52
lines changed

content/CHANGELOG.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,58 @@ search:
55

66
# ChangeLog
77

8+
## Version 25.08
9+
10+
#### API Commands
11+
12+
- `ban_account`: Run `sm_kick_user` event when kicking account ([#4415](https://github.com/processone/ejabberd/issues/4415))
13+
- `ban_account`: No need to change password ([#4415](https://github.com/processone/ejabberd/issues/4415))
14+
- `mnesia_change`: New command in `ejabberdctl` script that helps changing the mnesia node name
15+
16+
#### Configuration
17+
18+
- Rename `auth_password_types_hidden_in_scram1` option to `auth_password_types_hidden_in_sasl1`
19+
- `econf`: If a host in configuration is encoded IDNA, decode it ([#3519](https://github.com/processone/ejabberd/issues/3519))
20+
- `ejabberd_config`: New predefined keyword `HOST_URL_ENCODE`
21+
- `ejabberd.yml.example`: Use `HOST_URL_ENCODE` to handle case when vhost is non-latin1
22+
- `mod_conversejs`: Add option `conversejs_plugins` ([#4413](https://github.com/processone/ejabberd/issues/4413))
23+
- `mod_matrix_gw`: Add `leave_timeout` option ([#4386](https://github.com/processone/ejabberd/issues/4386))
24+
25+
#### Documentation and Tests
26+
27+
- `COMPILE.md`: Mention dependencies and add link to Docs ([#4431](https://github.com/processone/ejabberd/issues/4431))
28+
- `ejabberd_doc`: Document commands tags for modules
29+
- CI: bump XMPP-Interop-Testing/xmpp-interop-tests-action ([#4425](https://github.com/processone/ejabberd/issues/4425))
30+
- Runtime: Raise the minimum Erlang tested to Erlang/OTP 24
31+
32+
#### Installers and Container
33+
34+
- Bump Erlang/OTP version to 27.3.4.2
35+
- Bump OpenSSL version to 3.5.2
36+
- `make-binaries`: Disable Linux-PAM's `logind` support
37+
38+
#### Core and Modules
39+
40+
- Bump `p1_acme` to fix `'AttributePKCS-10'` and OTP 28 ([processone/p1_acme#4](https://github.com/processone/p1_acme/issues/4))
41+
- Prevent loops in `xml_compress:decode` with corrupted data
42+
- `ejabberd_auth_mnesia`: Fix issue with filtering duplicates in `get_users()`
43+
- `ejabberd_listener`: Add secret in temporary unix domain socket path ([#4422](https://github.com/processone/ejabberd/issues/4422))
44+
- `ejabberd_listener`: Log error when cannot set definitive unix socket ([#4422](https://github.com/processone/ejabberd/issues/4422))
45+
- `ejabberd_listener`: Try to create provisional socket in final directory ([#4422](https://github.com/processone/ejabberd/issues/4422))
46+
- `ejabberd_logger`: Print log lines colorized in console when using rebar3
47+
- `mod_conversejs`: Ensure assets_path ends in `/` as required by Converse ([#4414](https://github.com/processone/ejabberd/issues/4414))
48+
- `mod_conversejs`: Ensure plugins URL is separated with `/` ([#4413](https://github.com/processone/ejabberd/issues/4413))
49+
- `mod_http_upload`: Encode URLs into IDNA when showing to XMPP client ([#3519](https://github.com/processone/ejabberd/issues/3519))
50+
- `mod_matrix_gw`: Add support for null values in `is_canonical_json` ([#4421](https://github.com/processone/ejabberd/issues/4421))
51+
- `mod_matrix_gw`: Don't send empty direct Matrix messages ([#4420](https://github.com/processone/ejabberd/issues/4420))
52+
- `mod_matrix_gw`: Matrix gateway updates
53+
- `mod_muc`: Report db failures when restoring rooms
54+
- `mod_muc`: Unsubscribe users from members-only rooms when expelled ([#4412](https://github.com/processone/ejabberd/issues/4412))
55+
- `mod_providers`: New module to serve easily XMPP Providers files
56+
- `mod_register`: Don't duplicate welcome subject and message
57+
- `mod_scram_upgrade`: Fix format of passwords updates
58+
- `mod_scram_upgrade`: Only offer upgrades to methods that aren't already stored
59+
860
## Version 25.07
961

1062
#### Security fix

content/CONTAINER.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ Let's summarize the differences between both container images. Legend:
10721072
| Generated by | [container.yml](https://github.com/processone/ejabberd/blob/master/.github/workflows/container.yml) | [tests.yml](https://github.com/processone/docker-ejabberd/blob/master/.github/workflows/tests.yml) |
10731073
| Built for | stable releases <br /> `master` branch | stable releases <br /> [`master` branch zip](https://github.com/processone/docker-ejabberd/actions/workflows/tests.yml) |
10741074
| Architectures | `linux/amd64` <br /> `linux/arm64` | `linux/amd64` |
1075-
| Software | Erlang/OTP 27.3.4.1-alpine <br /> Elixir 1.18.4 | Alpine 3.19 <br /> Erlang/OTP 26.2 <br /> Elixir 1.15.7 |
1075+
| Software | Erlang/OTP 27.3.4.2-alpine <br /> Elixir 1.18.4 | Alpine 3.19 <br /> Erlang/OTP 26.2 <br /> Elixir 1.15.7 |
10761076
| Published in | [ghcr.io/processone/ejabberd](https://github.com/processone/ejabberd/pkgs/container/ejabberd) | [docker.io/ejabberd/ecs](https://hub.docker.com/r/ejabberd/ecs/) <br /> [ghcr.io/processone/ecs](https://github.com/processone/docker-ejabberd/pkgs/container/ecs) |
10771077
| :black_square_button: **Additional content** |
10781078
| [ejabberd-contrib](#ejabberd-contrib) | included | not included |

content/admin/configuration/modules.md

Lines changed: 162 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ search:
77

88
!!! info "Please note"
99

10-
This section describes modules options of ejabberd [25.07](../../archive/25.07/index.md). If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md).
10+
This section describes modules options of ejabberd [25.08](../../archive/25.08/index.md). If you are using an old ejabberd release, please refer to the corresponding archived version of this page in the [Archive](../../archive/index.md).
1111

1212
The modules that changed in this version are marked with 🟤.
1313

@@ -244,8 +244,8 @@ only.
244244
- **use\_cache**: `true | false`
245245
Same as top-level [use_cache](toplevel.md#use_cache) option, but applied to this module only.
246246

247-
mod\_antispam 🟤
248-
----------------
247+
mod\_antispam
248+
-------------
249249

250250
<!-- md:version added in [25.07](../../archive/25.07/index.md) -->
251251

@@ -665,8 +665,8 @@ modules:
665665
access: configure
666666
~~~
667667

668-
mod\_conversejs 🟤
669-
------------------
668+
mod\_conversejs
669+
---------------
670670

671671
<!-- md:version improved in [25.07](../../archive/25.07/index.md) -->
672672

@@ -707,6 +707,13 @@ configuration](https://conversejs.org/docs/html/configuration.html).
707707
Only boolean, integer and string values are supported; lists are not
708708
supported.
709709

710+
- **conversejs\_plugins**: `[Filename]`
711+
List of additional local files to include as scripts in the homepage.
712+
Please make sure those files are available in the path specified in
713+
`conversejs_resources` option, in subdirectory `plugins/`. If using the
714+
public Converse client, then `"libsignal"` gets replaced with the URL of
715+
the public library. The default value is `[]`.
716+
710717
- **conversejs\_resources**: `Path`
711718
<!-- md:version added in [22.05](../../archive/22.05/index.md) -->
712719
Local path to the Converse
@@ -743,6 +750,7 @@ listen:
743750
modules:
744751
mod_bosh: {}
745752
mod_conversejs:
753+
conversejs_plugins: ["libsignal"]
746754
websocket_url: "ws://@HOST@:5280/websocket"
747755
~~~
748756

@@ -761,7 +769,9 @@ listen:
761769

762770
modules:
763771
mod_conversejs:
764-
conversejs_resources: "/home/ejabberd/conversejs-9.0.0/package/dist"
772+
conversejs_resources: "/home/ejabberd/conversejs-x.y.z/package/dist"
773+
conversejs_plugins: ["libsignal-protocol.min.js"]
774+
# File path is: /home/ejabberd/conversejs-x.y.z/package/dist/plugins/libsignal-protocol.min.js
765775
~~~
766776

767777
Configure some additional options for Converse
@@ -1213,8 +1223,10 @@ XMPP clients.
12131223
- **put\_url**: `URL`
12141224
This option specifies the initial part of the PUT URLs used for file
12151225
uploads. The keyword `@HOST@` is replaced with the virtual host name.
1216-
NOTE: different virtual hosts cannot use the same PUT URL. The default
1217-
value is `"https://@HOST@:5443/upload"`.
1226+
And `@HOST_URL_ENCODE@` is replaced with the host name encoded for
1227+
URL, useful when your virtual hosts contain non-latin characters. NOTE:
1228+
different virtual hosts cannot use the same PUT URL. The default value
1229+
is `"https://@HOST@:5443/upload"`.
12181230

12191231
- **rm\_on\_unregister**: `true | false`
12201232
This option specifies whether files uploaded by a user should be removed
@@ -1471,12 +1483,14 @@ default value is `false`.
14711483
mod\_matrix\_gw 🟤
14721484
------------------
14731485

1474-
<!-- md:version improved in [25.07](../../archive/25.07/index.md) -->
1486+
<!-- md:version improved in [25.08](../../archive/25.08/index.md) -->
14751487

14761488

1477-
[Matrix](https://matrix.org/) gateway. Erlang/OTP 25 or higher is
1478-
required to use this module. This module is available since ejabberd
1479-
24.02.
1489+
[Matrix](https://matrix.org/) gateway. Supports room versions 9, 10 and
1490+
11 since ejabberd [25.03](../../archive/25.03/index.md); room versions 4 and higher since ejabberd
1491+
25.07; room version 12 (hydra rooms) since ejabberd [25.08](../../archive/25.08/index.md). Erlang/OTP 25
1492+
or higher is required to use this module. This module is available since
1493+
ejabberd [24.02](../../archive/24.02/index.md).
14801494

14811495
__Available options:__
14821496

@@ -1492,6 +1506,10 @@ Value of the matrix signing key, in base64.
14921506
- **key\_name**: `string()`
14931507
Name of the matrix signing key.
14941508

1509+
- **leave\_timeout**: `integer()`
1510+
Delay in seconds between a user leaving a MUC room and sending `leave`
1511+
Matrix event.
1512+
14951513
- **matrix\_domain**: `Domain`
14961514
Specify a domain in the Matrix federation. The keyword `@HOST@` is
14971515
replaced with the hostname. The default value is `@HOST@`.
@@ -1508,6 +1526,9 @@ user `@user:matrixdomain.tld`, the client must send a message to the JID
15081526
`matrix.myxmppdomain.tld` is the JID of the gateway service as set by
15091527
the `host` option. The default is `false`.
15101528

1529+
- **notary\_servers**: `[Server, ...]`
1530+
A list of notary servers.
1531+
15111532
__**Example**:__
15121533

15131534
~~~ yaml
@@ -2762,6 +2783,133 @@ modules:
27622783
outgoing: all
27632784
~~~
27642785

2786+
mod\_providers 🟤
2787+
-----------------
2788+
2789+
<!-- md:version added in [25.08](../../archive/25.08/index.md) -->
2790+
2791+
2792+
This module serves JSON provider files API v2 as described by [XMPP
2793+
Providers](https://providers.xmpp.net/provider-file-generator/).
2794+
2795+
It attempts to fill some properties gathering values automatically from
2796+
your existing ejabberd configuration. Try enabling the module, check
2797+
what values are displayed, and then customize using the options.
2798+
2799+
To use this module, in addition to adding it to the `modules` section,
2800+
you must also enable it in `listen` → `ejabberd_http` →
2801+
[request_handlers](listen-options.md#request_handlers). Notice you
2802+
should set in [ejabberd_http](listen.md#ejabberd_http) the option
2803+
[tls](listen-options.md#tls) enabled.
2804+
2805+
__Available options:__
2806+
2807+
- **alternativeJids**: `[string()]`
2808+
List of JIDs (XMPP server domains) a provider offers for registration
2809+
other than its main JID. The default value is `[]`.
2810+
2811+
- **busFactor**: `integer()`
2812+
Bus factor of the XMPP service (i.e., the minimum number of team members
2813+
that the service could not survive losing) or `-1` for n/a. The default
2814+
value is `-1`.
2815+
2816+
- **freeOfCharge**: `true | false`
2817+
Whether the XMPP service can be used for free. The default value is
2818+
`false`.
2819+
2820+
- **languages**: `[string()]`
2821+
List of language codes that your pages are available. Some options
2822+
define URL where the keyword `@LANGUAGE_URL@` will be replaced with
2823+
each of those language codes. The default value is a list with the
2824+
language set in the option [language](toplevel.md#language), for example: `[en]`.
2825+
2826+
- **legalNotice**: `string()`
2827+
Legal notice web page (per language). The keyword `@LANGUAGE_URL@` is
2828+
replaced with each language. The default value is `""`.
2829+
2830+
- **maximumHttpFileUploadStorageTime**: `integer()`
2831+
Maximum storage duration of each shared file (number in days, `0` for no
2832+
limit or `-1` for less than 1 day). The default value is the same as
2833+
option `max_days` from module [mod_http_upload_quota](#mod_http_upload_quota), or `0`
2834+
otherwise.
2835+
2836+
- **maximumHttpFileUploadTotalSize**: `integer()`
2837+
Maximum size of all shared files in total per user (number in megabytes
2838+
(MB), `0` for no limit or `-1` for less than 1 MB). Attention: MB is
2839+
used instead of MiB (e.g., 104,857,600 bytes = 100 MiB H 104 MB). This
2840+
property is not about the maximum size of each shared file, which is
2841+
already retrieved via XMPP. The default value is the value of the shaper
2842+
value of option `access_hard_quota` from module
2843+
[mod_http_upload_quota](#mod_http_upload_quota), or `0` otherwise.
2844+
2845+
- **maximumMessageArchiveManagementStorageTime**: `integer()`
2846+
Maximum storage duration of each exchanged message (number in days, `0`
2847+
for no limit or `-1` for less than 1 day). The default value is `0`.
2848+
2849+
- **organization**: `string()`
2850+
Type of organization providing the XMPP service. Allowed values are:
2851+
`company`, `"commercial person"`, `"private person"`, `governmental`,
2852+
`"non-governmental"` or `""`. The default value is `""`.
2853+
2854+
- **passwordReset**: `string()`
2855+
Password reset web page (per language) used for an automatic password
2856+
reset (e.g., via email) or describing how to manually reset a password
2857+
(e.g., by contacting the provider). The keyword `@LANGUAGE_URL@` is
2858+
replaced with each language. The default value is an URL built
2859+
automatically if [mod_register_web](#mod_register_web) is configured as a
2860+
`request_handler`, or `""` otherwise.
2861+
2862+
- **professionalHosting**: `true | false`
2863+
Whether the XMPP server is hosted with good internet connection speed,
2864+
uninterruptible power supply, access protection and regular backups. The
2865+
default value is `false`.
2866+
2867+
- **serverLocations**: `[string()]`
2868+
List of language codes of Server/Backup locations. The default value is
2869+
an empty list: `[]`.
2870+
2871+
- **serverTesting**: `true | false`
2872+
Whether tests against the provider’s server are allowed (e.g.,
2873+
certificate checks and uptime monitoring). The default value is `false`.
2874+
2875+
- **since**: `string()`
2876+
Date since the XMPP service is available. The default value is an empty
2877+
string: `""`.
2878+
2879+
- **website**: `string()`
2880+
Provider website. The keyword `@LANGUAGE_URL@` is replaced with each
2881+
language. The default value is `""`.
2882+
2883+
__**Example**:__
2884+
2885+
~~~ yaml
2886+
listen:
2887+
-
2888+
port: 443
2889+
module: ejabberd_http
2890+
tls: true
2891+
request_handlers:
2892+
/.well-known/xmpp-provider-v2.json: mod_providers
2893+
2894+
modules:
2895+
mod_providers:
2896+
alternativeJids: ["example1.com", "example2.com"]
2897+
busFactor: 1
2898+
freeOfCharge: true
2899+
languages: [ag, ao, bg, en]
2900+
legalNotice: "http://@HOST@/legal/@LANGUAGE_URL@/"
2901+
maximumHttpFileUploadStorageTime: 0
2902+
maximumHttpFileUploadTotalSize: 0
2903+
maximumMessageArchiveManagementStorageTime: 0
2904+
organization: "non-governmental"
2905+
passwordReset: "http://@HOST@/reset/@LANGUAGE_URL@/"
2906+
professionalHosting: true
2907+
serverLocations: [ao, bg]
2908+
serverTesting: true
2909+
since: "2025-12-31"
2910+
website: "http://@HOST@/website/@LANGUAGE_URL@/"
2911+
~~~
2912+
27652913
mod\_proxy65
27662914
------------
27672915

@@ -3073,8 +3221,8 @@ modules:
30733221

30743222
**API Tags:** [purge](../../developer/ejabberd-api/admin-tags.md#purge)
30753223

3076-
mod\_pubsub\_serverinfo 🟤
3077-
--------------------------
3224+
mod\_pubsub\_serverinfo
3225+
-----------------------
30783226

30793227
<!-- md:version added in [25.07](../../archive/25.07/index.md) -->
30803228

0 commit comments

Comments
 (0)