Skip to content

Commit 6f3466e

Browse files
badlopbadlop
committed
Remove references to useless option default_host in ejabberd_http
The option 'default_host' for ejabberd_http was added years ago in commit 7d623d5. However it was problematic and the usage was removed in commit 83c291c. It's time to remove its last forgotten bits.
1 parent 8cde7c0 commit 6f3466e

40 files changed

+57
-256
lines changed

‎content/admin/configuration/listen-options.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,6 @@ then the top-level option is used, not this one.
102102
Specify additional HTTP headers to be included in all HTTP responses.
103103
Default value is: `[]`
104104

105-
## default_host
106-
107-
*undefined | HostName*
108-
109-
If the HTTP request received by ejabberd contains the HTTP header
110-
`Host` with an ambiguous virtual host that doesn’t match any one
111-
defined in ejabberd (see
112-
[Host Names](basic.md#host_names)),
113-
then this configured HostName
114-
is set as the request Host. The default value of this option is:
115-
`undefined`.
116-
117105
## dhfile
118106

119107
*Path*

‎content/admin/configuration/listen.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ Options:
346346
[cafile](listen-options.md#cafile),
347347
[ciphers](listen-options.md#ciphers),
348348
[custom_headers](listen-options.md#custom_headers),
349-
[default_host](listen-options.md#default_host),
350349
[dhfile](listen-options.md#dhfile),
351350
[protocol_options](listen-options.md#protocol_options),
352351
[request_handlers](listen-options.md#request_handlers),

‎content/admin/configuration/toplevel.md

Lines changed: 57 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ search:
55

66
# Top-Level Options
77

8-
!!! info "Please note"
9-
10-
This section describes top level options of ejabberd [25.03](../../archive/25.03/index.md) and [25.04](../../archive/25.04/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).
11-
12-
The options that changed in this version are marked with 🟤.
8+
This section describes top level options of ejabberd [25.04](../../archive/25.04/index.md).71. The
9+
options that changed in this version are marked with 🟤.
1310

1411
## access\_rules
1512

@@ -308,7 +305,7 @@ you already have passwords generated with a different algorithm - users
308305
that have such passwords will not be able to authenticate. The default
309306
value is `sha`.
310307

311-
## auth\_stored\_password\_types 🟤
308+
## auth\_stored\_password\_types
312309

313310
`[plain | scram_sha1 | scram_sha256 | scram_sha512]`
314311

@@ -553,7 +550,7 @@ Default volatile (in-memory) storage for ejabberd. Modules and other
553550
components (e.g. session management) may have its own value. The default
554551
value is `mnesia`.
555552

556-
## define\_keyword 🟤
553+
## define\_keyword
557554

558555
`{NAME: Value}`
559556

@@ -576,7 +573,7 @@ host_config:
576573
sql_username: "prefix.@SQL_USERNAME@"
577574
~~~
578575

579-
## define\_macro 🟤
576+
## define\_macro
580577

581578
`{NAME: Value}`
582579

@@ -771,6 +768,30 @@ host_config:
771768
List of one or more [host names](../configuration/basic.md#host-names)
772769
(or domains) that ejabberd will serve. This is a **mandatory** option.
773770

771+
## hosts\_alias
772+
773+
`{Alias: Host}`
774+
775+
<!-- md:version added in 25.xx -->
776+
777+
Define aliases for existing
778+
vhosts managed by ejabberd. An alias may be a regexp expression. This
779+
option is only consulted by the `ejabberd_http` listener.
780+
781+
**Example**:
782+
783+
~~~ yaml
784+
hosts:
785+
- domain.tld
786+
- example.org
787+
788+
hosts_alias:
789+
xmpp.domain.tld: domain.tld
790+
jabber.domain.tld: domain.tld
791+
mytest.net: example.org
792+
"exa*": example.org
793+
~~~
794+
774795
## include\_config\_file
775796

776797
*\[Filename, ...\] | {Filename: Options}*
@@ -1358,6 +1379,34 @@ default value is `closeold`. If the client uses old Jabber Non-SASL
13581379
authentication (XEP-0078), then this option is not respected, and the
13591380
action performed is `closeold`.
13601381

1382+
## rest\_proxy
1383+
1384+
`Host`
1385+
1386+
Address of a HTTP Connect proxy used by modules issuing rest calls (like
1387+
ejabberd\_oauth\_rest)
1388+
1389+
## rest\_proxy\_password
1390+
1391+
`string()`
1392+
1393+
Password used to authenticate to HTTP Connect proxy used by modules
1394+
issuing rest calls (like ejabberd\_oauth\_rest)
1395+
1396+
## rest\_proxy\_port
1397+
1398+
`1..65535`
1399+
1400+
Port of a HTTP Connect proxy used by modules issuing rest calls (like
1401+
ejabberd\_oauth\_rest)
1402+
1403+
## rest\_proxy\_username
1404+
1405+
`string()`
1406+
1407+
Username used to authenticate to HTTP Connect proxy used by modules
1408+
issuing rest calls (like ejabberd\_oauth\_rest)
1409+
13611410
## router\_cache\_life\_time
13621411

13631412
`timeout()`

‎content/archive/20.04/listen-options.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,6 @@ OpenSSL ciphers list in the same format accepted by
7070
Specify additional HTTP headers to be included in all HTTP responses.
7171
Default value is: `[]`
7272

73-
## default_host
74-
75-
*undefined | HostName*
76-
77-
If the HTTP request received by ejabberd contains the HTTP header
78-
`Host` with an ambiguous virtual host that doesn’t match any one
79-
defined in ejabberd (see
80-
[Host Names](../../admin/configuration/basic.md#host_names)),
81-
then this configured HostName
82-
is set as the request Host. The default value of this option is:
83-
`undefined`.
84-
8573
## dhfile
8674

8775
*Path*

‎content/archive/20.04/listen.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ Options:
181181
[cafile](listen-options.md#cafile),
182182
[ciphers](listen-options.md#ciphers),
183183
[custom_headers](listen-options.md#custom_headers),
184-
[default_host](listen-options.md#default_host),
185184
[dhfile](listen-options.md#dhfile),
186185
[protocol_options](listen-options.md#protocol_options),
187186
[request_handlers](listen-options.md#request_handlers),

‎content/archive/20.07/listen-options.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,6 @@ OpenSSL ciphers list in the same format accepted by
7070
Specify additional HTTP headers to be included in all HTTP responses.
7171
Default value is: `[]`
7272

73-
## default_host
74-
75-
*undefined | HostName*
76-
77-
If the HTTP request received by ejabberd contains the HTTP header
78-
`Host` with an ambiguous virtual host that doesn’t match any one
79-
defined in ejabberd (see
80-
[Host Names](../../admin/configuration/basic.md#host_names)),
81-
then this configured HostName
82-
is set as the request Host. The default value of this option is:
83-
`undefined`.
84-
8573
## dhfile
8674

8775
*Path*

‎content/archive/20.07/listen.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ Options:
183183
[cafile](listen-options.md#cafile),
184184
[ciphers](listen-options.md#ciphers),
185185
[custom_headers](listen-options.md#custom_headers),
186-
[default_host](listen-options.md#default_host),
187186
[dhfile](listen-options.md#dhfile),
188187
[protocol_options](listen-options.md#protocol_options),
189188
[request_handlers](listen-options.md#request_handlers),

‎content/archive/20.12/listen-options.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,6 @@ OpenSSL ciphers list in the same format accepted by
7878
Specify additional HTTP headers to be included in all HTTP responses.
7979
Default value is: `[]`
8080

81-
## default_host
82-
83-
*undefined | HostName*
84-
85-
If the HTTP request received by ejabberd contains the HTTP header
86-
`Host` with an ambiguous virtual host that doesn’t match any one
87-
defined in ejabberd (see
88-
[Host Names](../../admin/configuration/basic.md#host_names)),
89-
then this configured HostName
90-
is set as the request Host. The default value of this option is:
91-
`undefined`.
92-
9381
## dhfile
9482

9583
*Path*

‎content/archive/20.12/listen.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ Options:
183183
[cafile](listen-options.md#cafile),
184184
[ciphers](listen-options.md#ciphers),
185185
[custom_headers](listen-options.md#custom_headers),
186-
[default_host](listen-options.md#default_host),
187186
[dhfile](listen-options.md#dhfile),
188187
[protocol_options](listen-options.md#protocol_options),
189188
[request_handlers](listen-options.md#request_handlers),

‎content/archive/21.01/listen-options.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,6 @@ OpenSSL ciphers list in the same format accepted by
7878
Specify additional HTTP headers to be included in all HTTP responses.
7979
Default value is: `[]`
8080

81-
## default_host
82-
83-
*undefined | HostName*
84-
85-
If the HTTP request received by ejabberd contains the HTTP header
86-
`Host` with an ambiguous virtual host that doesn’t match any one
87-
defined in ejabberd (see
88-
[Host Names](../../admin/configuration/basic.md#host_names)),
89-
then this configured HostName
90-
is set as the request Host. The default value of this option is:
91-
`undefined`.
92-
9381
## dhfile
9482

9583
*Path*

0 commit comments

Comments
 (0)