Skip to content

Commit d563358

Browse files
committed
Copy some improvements from ejabberd upstream
1 parent db8214c commit d563358

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

ecs/bin/ejabberdctl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ livewarning()
196196
echo "Please be extremely cautious with your actions,"
197197
echo "and exit immediately if you are not completely sure."
198198
echo ""
199-
echo "To exit and detach this shell from ejabberd, press:"
199+
echo "To stop ejabberd gracefully:"
200+
echo " ejabberd:stop()."
201+
echo "To quit erlang immediately, press:"
200202
echo " control+g and then q"
201203
echo ""
202204
echo "--------------------------------------------------------------------"

ecs/conf/ejabberd.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ listen:
9292
module: ejabberd_http
9393
request_handlers:
9494
/: ejabberd_web_admin
95+
-
96+
port: PORT_STUN
97+
ip: "::"
98+
transport: udp
99+
module: ejabberd_stun
100+
use_turn: true
101+
## The server's public IPv4 address:
102+
# turn_ipv4_address: "203.0.113.3"
103+
## The server's public IPv6 address:
104+
# turn_ipv6_address: "2001:db8::3"
95105
-
96106
port: PORT_MQTT
97107
ip: "::"
@@ -186,7 +196,12 @@ api_permissions:
186196
from: ejabberd_web_admin
187197
who: admin
188198
what: "*"
189-
"admin access":
199+
"adhoc commands":
200+
from: mod_adhoc_api
201+
who: admin
202+
what: "*"
203+
"http access":
204+
from: mod_http_api
190205
who:
191206
access:
192207
allow:
@@ -231,6 +246,7 @@ acme:
231246

232247
modules:
233248
mod_adhoc: {}
249+
mod_adhoc_api: {}
234250
mod_admin_extra: {}
235251
mod_announce:
236252
access: announce
@@ -245,7 +261,7 @@ modules:
245261
mod_fail2ban: {}
246262
mod_http_api: {}
247263
mod_http_upload:
248-
put_url: https://@HOST@:5443/upload
264+
put_url: https://@HOST_URL_ENCODE@:5443/upload
249265
custom_headers:
250266
"Access-Control-Allow-Origin": "https://@HOST@"
251267
"Access-Control-Allow-Methods": "GET,HEAD,PUT,OPTIONS"
@@ -269,7 +285,6 @@ modules:
269285
access_mam:
270286
- allow
271287
default_room_options:
272-
allow_subscription: true # enable MucSub
273288
mam: true
274289
mod_muc_admin: {}
275290
mod_muc_occupantid: {}
@@ -308,6 +323,7 @@ modules:
308323
mod_shared_roster: {}
309324
mod_stream_mgmt:
310325
resend_on_timeout: if_offline
326+
mod_stun_disco: {}
311327
mod_vcard: {}
312328
mod_vcard_xupdate: {}
313329
mod_version:

0 commit comments

Comments
 (0)