Merge pull request 'Upgrade ejabberd to 23.04, activate real-time MUC blocklists against spam' (#485) from chore/upgrade_ejabberd into master

Reviewed-on: #485

site-cookbooks/kosmos-ejabberd/attributes/default.rb

@@ -1,5 +1,6 @@
-node.default["kosmos-ejabberd"]["version"] = "22.05"
-node.default["kosmos-ejabberd"]["checksum"] = "b267a22fa9aebf3d77fb71d786520875d164b12d9e95393d63a970a7e165b20f"
+node.default["kosmos-ejabberd"]["version"] = "23.04"
+node.default["kosmos-ejabberd"]["package_version"] = "1"
+node.default["kosmos-ejabberd"]["checksum"] = "0bc273043085f8bc333abd176e767cc0a77b7336014777c2f2d10ae27e3d8aec"
 node.default["kosmos-ejabberd"]["turn_ip_address"] = "148.251.83.201"
 node.default["kosmos-ejabberd"]["stun_turn_port"] = 3478
 node.default["kosmos-ejabberd"]["turn_min_port"] = 50000

site-cookbooks/kosmos-ejabberd/recipes/default.rb

@@ -10,9 +10,7 @@ package_checksum = node["kosmos-ejabberd"]["checksum"]
 package_path = "#{Chef::Config['file_cache_path']}/ejabberd_#{ejabberd_version}_amd64.deb"
 
 remote_file package_path do
-  # TODO There is a -2 suffix on the filename now. Need to see why and if it
-  # changes with new releases
-  source "https://github.com/processone/ejabberd/releases/download/#{ejabberd_version}/ejabberd_#{ejabberd_version}-2_amd64.deb"
+  source "https://github.com/processone/ejabberd/releases/download/#{ejabberd_version}/ejabberd_#{ejabberd_version}-#{node["kosmos-ejabberd"]["package_version"]}_amd64.deb"
   checksum package_checksum
   notifies :install, "dpkg_package[ejabberd]", :immediately
 end
@@ -94,6 +92,7 @@ modules:
         default_room_options:
           mam: true
         preload_rooms: true
+      mod_muc_rtbl: {}
       mod_http_upload:
         put_url: "https://uploads.kosmos.chat/8af2c77"
         external_secret: "#{ejabberd_credentials["uploads_secret"]}"
@@ -134,6 +133,7 @@ modules:
           persistent: true
           mam: true
         preload_rooms: true
+      mod_muc_rtbl: {}
       mod_http_upload:
         put_url: "https://uploads.kosmos.chat/2802cfe"
         external_secret: "#{ejabberd_credentials["uploads_secret"]}"

site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb

@@ -195,6 +195,7 @@ api_permissions:
       - "add_rosteritem"
       - "delete_rosteritem"
       - "send_message"
+      - "private_set"
 
 language: "en"