From f8f3fc7c3a7bcbbbef9aa8ff4b04cc40baa6b40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 19 Apr 2023 17:30:55 +0200 Subject: [PATCH 1/3] Upgrade ejabberd to 23.04 Also add a package version attribute, since the value changed in the past. --- site-cookbooks/kosmos-ejabberd/attributes/default.rb | 5 +++-- site-cookbooks/kosmos-ejabberd/recipes/default.rb | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/site-cookbooks/kosmos-ejabberd/attributes/default.rb b/site-cookbooks/kosmos-ejabberd/attributes/default.rb index 365da66..b0c9ecb 100644 --- a/site-cookbooks/kosmos-ejabberd/attributes/default.rb +++ b/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 diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index d4a4ab7..fc30712 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/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 -- 2.25.1 From 14e04d77a93190edc067058193f2c315a0d87d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 19 Apr 2023 17:32:15 +0200 Subject: [PATCH 2/3] Activate real-time MUC blocklist module --- site-cookbooks/kosmos-ejabberd/recipes/default.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index fc30712..7a6e588 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb @@ -92,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"]}" @@ -132,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"]}" -- 2.25.1 From efb07ad3c1d224abbd54cc7e5ee7c008abd57818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 19 Apr 2023 17:32:30 +0200 Subject: [PATCH 3/3] Allow akkounts to set private XML storage data Enables https://gitea.kosmos.org/kosmos/akkounts/pulls/116 --- site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb index 9e2a662..7be7fbd 100644 --- a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb +++ b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb @@ -195,6 +195,7 @@ api_permissions: - "add_rosteritem" - "delete_rosteritem" - "send_message" + - "private_set" language: "en" -- 2.25.1