Merge pull request 'Fix MUC service/domains not being announced' (#416 ) from bugfix/muc_discovery into master

Reviewed-on: #416
Fix MUC service/domains not being announced
2022-06-11 09:16:23 +00:00 · 2022-06-03 18:07:50 +02:00
2 changed files with 17 additions and 7 deletions
--- 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:
--- 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:
Author	SHA1	Message	Date
Greg	7482283696	Merge pull request 'Fix MUC service/domains not being announced' (#416 ) from bugfix/muc_discovery into master Reviewed-on: #416	2022-06-11 09:16:23 +00:00
Basti	a85415ef48	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	2022-06-03 18:07:50 +02:00