From c64526a9444ad68527d0bba4a7ade90de55779ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 16 Oct 2024 12:17:38 +0200 Subject: [PATCH] Upgrade RTL to v0.15.2 Need to use `npm install --force` due to a dependency issue --- site-cookbooks/kosmos-bitcoin/attributes/default.rb | 2 +- site-cookbooks/kosmos-bitcoin/recipes/rtl.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/site-cookbooks/kosmos-bitcoin/attributes/default.rb b/site-cookbooks/kosmos-bitcoin/attributes/default.rb index 2a37593..010fcf2 100644 --- a/site-cookbooks/kosmos-bitcoin/attributes/default.rb +++ b/site-cookbooks/kosmos-bitcoin/attributes/default.rb @@ -71,7 +71,7 @@ node.default['boltz']['rest_port'] = '9003' node.default['boltz']['no_macaroons'] = 'false' node.default['rtl']['repo'] = 'https://github.com/Ride-The-Lightning/RTL.git' -node.default['rtl']['revision'] = 'v0.15.0' +node.default['rtl']['revision'] = 'v0.15.2' node.default['rtl']['host'] = '10.1.1.163' node.default['rtl']['port'] = '3000' diff --git a/site-cookbooks/kosmos-bitcoin/recipes/rtl.rb b/site-cookbooks/kosmos-bitcoin/recipes/rtl.rb index 42103d3..9218bb3 100644 --- a/site-cookbooks/kosmos-bitcoin/recipes/rtl.rb +++ b/site-cookbooks/kosmos-bitcoin/recipes/rtl.rb @@ -57,13 +57,17 @@ git rtl_dir do group bitcoin_group repository node['rtl']['repo'] revision node['rtl']['revision'] + notifies :run, "execute[npm_install]", :immediately notifies :restart, "systemd_unit[#{app_name}.service]", :delayed end -execute "npm install" do +execute "npm_install" do cwd rtl_dir environment "HOME" => rtl_dir user bitcoin_user + # TODO remove --force when upstream dependency issues have been resolved + command "npm install --force" + action :nothing end file "#{rtl_dir}/RTL-Config.json" do