From 90ce664f2e5a57f5e03c3384c1d7c1d00ec8b185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Sun, 24 Jan 2021 10:14:29 +0100 Subject: [PATCH] Update ejabberd to 20.12 It fixes a bug that prevented the config to be reloaded for LDAP options (https://github.com/processone/ejabberd/issues/3181) and more: https://www.process-one.net/blog/ejabberd-20-12/ --- site-cookbooks/kosmos-ejabberd/attributes/default.rb | 4 ++-- site-cookbooks/kosmos-ejabberd/recipes/default.rb | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/site-cookbooks/kosmos-ejabberd/attributes/default.rb b/site-cookbooks/kosmos-ejabberd/attributes/default.rb index fa4e89f..e4e6bf9 100644 --- a/site-cookbooks/kosmos-ejabberd/attributes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/attributes/default.rb @@ -1,5 +1,5 @@ -node.default["kosmos-ejabberd"]["version"] = "20.04" -node.default["kosmos-ejabberd"]["checksum"] = "5377ff18960a399e661fa23f4a1d9f57c78d4579ed108c52b8f68e7cd9268868" +node.default["kosmos-ejabberd"]["version"] = "20.12" +node.default["kosmos-ejabberd"]["checksum"] = "3d2a4e9d1aa2d189017f4f310eff4d0b6c6d7cd911209cfbcca7b0ec5b577b65" node.default["kosmos-ejabberd"]["turn_min_port"] = 50000 node.default["kosmos-ejabberd"]["turn_max_port"] = 55000 diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index dfffa4c..467b489 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb @@ -159,13 +159,7 @@ hosts.each do |host| ldap_server: ldap_domain, ldap_rootdn: ldap_rootdn, ldap_encryption_type: ldap_encryption_type - # Restarting the service is needed because the LDAP options are only parsed - # on start (https://github.com/processone/ejabberd/issues/3181#issuecomment-594482546) - # This can be changed back to reloading when this is part of a release: - # https://github.com/processone/ejabberd/commit/b39a1e2d74cd4d400a7f062e31056057573298e8 - # - # notifies :run, "execute[ejabberdctl reload_config]", :delayed - notifies :restart, "service[ejabberd]", :delayed + notifies :run, "execute[ejabberdctl reload_config]", :delayed end end