From f5dd2c7de966459ad5a2ee1fd67d51a3332ad80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 20 Apr 2020 14:52:11 +0200 Subject: [PATCH 1/2] Fix the command importing the schema on db creation It had an extra }, but this only fails when creating the databases --- site-cookbooks/kosmos-ejabberd/recipes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index c11aaaa..7128867 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb @@ -122,7 +122,7 @@ hosts.each do |host| execute "create db schema #{host[:sql_database]}" do user "ejabberd" - command "psql #{host[:sql_database]}} < #{Chef::Config[:file_cache_path]}/pg.sql" + command "psql #{host[:sql_database]} < #{Chef::Config[:file_cache_path]}/pg.sql" action :nothing end From db8bb44c8bd3694fb8937a18889e2f1db301bac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 20 Apr 2020 14:53:08 +0200 Subject: [PATCH 2/2] Update ejabberd to 20.03 The download URL has changed, they removed a prefix Closes #153 --- site-cookbooks/kosmos-ejabberd/attributes/default.rb | 4 ++-- site-cookbooks/kosmos-ejabberd/recipes/default.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site-cookbooks/kosmos-ejabberd/attributes/default.rb b/site-cookbooks/kosmos-ejabberd/attributes/default.rb index c71d3b5..22d1e9d 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.02" -node.default["kosmos-ejabberd"]["checksum"] = "2ecbf7025195afaa41996cb6f1c2b5fac661f2880238506a459779051129bc93" +node.default["kosmos-ejabberd"]["version"] = "20.03" +node.default["kosmos-ejabberd"]["checksum"] = "f0ccf1c47c3a30303140f08c887998ee34e731f34ea240d56748a68aa2a2e303" node.override["tor"]["HiddenServices"]["ejabberd"] = { "HiddenServicePorts" => [ diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb index 7128867..2de0b63 100644 --- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb +++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb @@ -38,7 +38,7 @@ package_checksum = node["kosmos-ejabberd"]["checksum"] package_path = "#{Chef::Config['file_cache_path']}/ejabberd_#{ejabberd_version}-0_amd64.deb" remote_file package_path do - source "https://www.process-one.net/downloads/downloads-action.php?file=/ejabberd/#{ejabberd_version}/ejabberd_#{ejabberd_version}-0_amd64.deb" + source "https://www.process-one.net/downloads/downloads-action.php?file=/#{ejabberd_version}/ejabberd_#{ejabberd_version}-0_amd64.deb" checksum package_checksum notifies :install, "dpkg_package[ejabberd]", :immediately end