aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-05-27 11:18:42 +0200
committerKim Alvefur <zash@zash.se>2021-05-27 11:18:42 +0200
commit4395895fef2e69d1f71d351bbecff7837672db73 (patch)
treeca8559faa0f090495bcac3fbc8926a7cefbddcb1
parent59cae27ea29cd4f4fb03e70add52f2ac7936836b (diff)
downloadprosody-4395895fef2e69d1f71d351bbecff7837672db73.tar.gz
prosody-4395895fef2e69d1f71d351bbecff7837672db73.zip
core.modulemanager: Inherit mod_server_contact_info onto components #1270
-rw-r--r--CHANGES1
-rw-r--r--core/modulemanager.lua1
-rw-r--r--spec/scansion/prosody.cfg.lua1
3 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 64df54ff..9a6cb1d4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ TRUNK
- MUC: support for XEP-0421 occupant identifiers
- mod_http_file_share: File sharing via HTTP (XEP-0363)
- statistics scheduling can be done by plugin
+- mod_server_contact_info now loaded on components if enabled
0.11.0
======
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 9d2a74c7..9256ae4f 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -42,6 +42,7 @@ local component_inheritable_modules = {
"iq",
"s2s",
"s2s_bidi",
+ "server_contact_info",
};
-- We need this to let modules access the real global namespace
diff --git a/spec/scansion/prosody.cfg.lua b/spec/scansion/prosody.cfg.lua
index c5ed279b..6d3980ed 100644
--- a/spec/scansion/prosody.cfg.lua
+++ b/spec/scansion/prosody.cfg.lua
@@ -127,7 +127,6 @@ Component "conference.localhost" "muc"
admins = { "Admin@localhost" }
modules_enabled = {
"muc_mam";
- "server_contact_info";
}