From a85415ef4878b548068bc40e2a049d4a740a86aa Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Fri, 3 Jun 2022 18:07:50 +0200 Subject: [PATCH] Fix MUC service/domains not being announced Only subdomains of `hosts` are automatically announced, but other domains have to be added manually via the `extra_domains` disco module config. fixes #413 --- .../kosmos-ejabberd/recipes/default.rb | 18 +++++++++++++++++- .../kosmos-ejabberd/templates/ejabberd.yml.erb | 6 ------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index abef46b..e742a97 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb @@ -75,8 +75,16 @@ hosts = [ ldap_password: ejabberd_credentials['kosmos_ldap_password'], append_host_config: <<-EOF modules: + mod_disco: + extra_domains: + - kosmos.chat + server_info: + - + modules: all + name: "abuse-addresses" + urls: ["mailto:abuse@kosmos.org"] mod_muc: - host: "kosmos.chat" + host: kosmos.chat access: - allow access_admin: @@ -100,6 +108,14 @@ modules: ldap_password: ejabberd_credentials['5apps_ldap_password'], append_host_config: <<-EOF modules: + mod_disco: + extra_domains: + - muc.5apps.com + server_info: + - + modules: all + name: "abuse-addresses" + urls: ["mailto:mail@5apps.com"] mod_muc: host: "muc.@HOST@" access: diff --git a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb index 56a27ba..8ec32ae 100644 --- a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb +++ b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb @@ -196,12 +196,6 @@ modules: mod_carboncopy: {} mod_client_state: {} mod_configure: {} # requires mod_adhoc - mod_disco: - server_info: - - - modules: all - name: "abuse-addresses" - urls: ["mailto:abuse@kosmos.org"] mod_bosh: {} mod_last: {} mod_mam: