sys-apps/calculate-server: поддержка ejabberd-20.04 (fixup)

mhiretskiy
parent 631e6af02a
commit 9bb50ac0bc

@ -1,12 +1,12 @@
diff --git a/profile/jabber/etc/jabber/ejabberd.yml b/profile/jabber/etc/jabber/ejabberd.yml diff --git a/profile/jabber/etc/jabber/ejabberd.yml b/profile/jabber/etc/jabber/ejabberd.yml
index 6706b1e..e4e44c2 100644 index 6706b1e..3bad236 100644
--- a/profile/jabber/etc/jabber/ejabberd.yml --- a/profile/jabber/etc/jabber/ejabberd.yml
+++ b/profile/jabber/etc/jabber/ejabberd.yml +++ b/profile/jabber/etc/jabber/ejabberd.yml
@@ -58,6 +58,35 @@ acl: @@ -58,6 +58,35 @@ acl:
local: local:
user_regexp: user_regexp:
- "" - ""
+#?pkg(ejabber)>=20.04# +#?pkg(ejabberd)>=20.04#
+access: +access:
+ announce: + announce:
+ - allow: admin + - allow: admin
@ -34,7 +34,7 @@ index 6706b1e..e4e44c2 100644
+ register: + register:
+ - deny + - deny
+#pkg# +#pkg#
+#?pkg(ejabber)<20.04# +#?pkg(ejabberd)<20.04#
access: access:
announce: announce:
admin: allow admin: allow
@ -46,12 +46,16 @@ index 6706b1e..e4e44c2 100644
language: "en" language: "en"
modules: modules:
mod_adhoc: [] mod_adhoc: []
@@ -122,7 +152,7 @@ modules: @@ -122,7 +152,12 @@ modules:
mod_pubsub: mod_pubsub:
access_createnode: pubsub_createnode access_createnode: pubsub_createnode
plugins: plugins:
- - "default" +#?pkg(ejabberd)>=20.04#
+ - "flat" + - "flat"
+#pkg#
+#?pkg(ejabberd)<20.04#
- "default"
+#pkg#
- "pep" - "pep"
mod_register: mod_register:
welcome_message: welcome_message:

Loading…
Cancel
Save