Merge branch 'master' into bugfix/vm_base_images

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:

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: