refactoring changes from sequpgrade (endReturn, ...) and some modernizations

This commit is contained in:
2023-01-03 15:49:08 +01:00
parent 215135e8aa
commit 3c22d5729f
69 changed files with 553 additions and 654 deletions

View File

@@ -8,8 +8,8 @@ log_rate_limit: 100
hosts:
- "mydomain.eu"
listen:
-
listen:
-
port: 5222
ip: "::"
module: ejabberd_c2s
@@ -37,11 +37,11 @@ listen:
access: c2s
zlib: true
resend_on_timeout: if_offline
-
-
port: 5269
ip: "::"
module: ejabberd_s2s_in
-
-
port: 5280
ip: "::"
module: ejabberd_http
@@ -124,8 +124,8 @@ acl:
user:
- "myuser": "mydomain.eu"
#- "@localhost"
local:
local:
user_regexp: ""
loopback:
@@ -160,23 +160,23 @@ access_rules:
announce:
- allow: admin
## Only admins can use the configuration interface:
configure:
configure:
- allow: admin
## Only accounts of the local ejabberd server can create rooms:
muc_create:
muc_create:
- allow: local
## Only accounts on the local ejabberd server can create Pubsub nodes:
pubsub_createnode:
pubsub_createnode:
- allow: local
## In-band registration allows registration of any possible username.
## To disable in-band registration, replace 'allow' with 'deny'.
register:
- deny
register:
- deny
## Only allow to register from localhost
trusted_network:
trusted_network:
- allow: loopback
## Do not establish S2S connections with bad servers
s2s:
s2s:
## - deny:
## - ip: "XXX.XXX.XXX.XXX/32"
## - deny:
@@ -185,7 +185,7 @@ access_rules:
language: "en"
modules:
modules:
mod_adhoc: {}
mod_admin_extra: {}
mod_announce: # recommends mod_adhoc
@@ -216,7 +216,7 @@ modules:
## docroot: "/var/www"
## accesslog: "/var/log/ejabberd/access.log"
mod_last: {}
mod_muc:
mod_muc:
## host: "conference.@HOST@"
access:
- allow
@@ -227,7 +227,7 @@ modules:
## mod_muc_log: {}
mod_muc_admin: {}
## mod_multicast: {}
mod_offline:
mod_offline:
access_max_user_messages: max_user_offline_messages
mod_ping: {}
## mod_pres_counter:
@@ -236,7 +236,7 @@ modules:
mod_privacy: {}
mod_private: {}
## mod_proxy65: {}
mod_pubsub:
mod_pubsub:
access_createnode: pubsub_createnode
## reduces resource comsumption, but XEP incompliant
#ignore_pep_from_offline: true
@@ -246,7 +246,7 @@ modules:
max_items_node: 1000
default_node_config:
max_items: 1000
plugins:
plugins:
- "flat"
- "hometree"
- "pep" # pep requires mod_caps
@@ -283,7 +283,7 @@ modules:
##
## access_from: deny
## access: register
# No registration, but allow existing accounts to change password
access: none
mod_roster: