diff --git a/site-cookbooks/kosmos-bitcoin/attributes/default.rb b/site-cookbooks/kosmos-bitcoin/attributes/default.rb index 2a14c39..a99c5e8 100644 --- a/site-cookbooks/kosmos-bitcoin/attributes/default.rb +++ b/site-cookbooks/kosmos-bitcoin/attributes/default.rb @@ -86,9 +86,6 @@ node.default['lndhub-go']['branding'] = { 'footer' => 'about=https://kosmos.org' } -node.default['dotnet']['ms_packages_src_url'] = "https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb" -node.default['dotnet']['ms_packages_src_checksum'] = "4df5811c41fdded83eb9e2da9336a8dfa5594a79dc8a80133bd815f4f85b9991" - node.default['nbxplorer']['repo'] = 'https://github.com/dgarage/NBXplorer' node.default['nbxplorer']['revision'] = 'v2.5.26' node.default['nbxplorer']['source_dir'] = '/opt/nbxplorer' @@ -98,7 +95,7 @@ node.default['nbxplorer']['postgres']['database'] = 'nbxplorer' node.default['nbxplorer']['postgres']['user'] = 'nbxplorer' node.default['btcpay']['repo'] = 'https://github.com/btcpayserver/btcpayserver' -node.default['btcpay']['revision'] = 'v2.1.1' +node.default['btcpay']['revision'] = 'v2.3.7' node.default['btcpay']['source_dir'] = '/opt/btcpay' node.default['btcpay']['config_path'] = "/home/#{node['bitcoin']['username']}/.btcpayserver/Main/settings.config" node.default['btcpay']['log_path'] = "/home/#{node['bitcoin']['username']}/.btcpayserver/debug.log" diff --git a/site-cookbooks/kosmos-bitcoin/recipes/dotnet.rb b/site-cookbooks/kosmos-bitcoin/recipes/dotnet.rb index d2d4f30..517324f 100644 --- a/site-cookbooks/kosmos-bitcoin/recipes/dotnet.rb +++ b/site-cookbooks/kosmos-bitcoin/recipes/dotnet.rb @@ -5,29 +5,16 @@ build_essential -apt_repository 'universe' do - uri 'http://archive.ubuntu.com/ubuntu/' - distribution 'focal' - components ['universe'] +remote_file "/opt/dotnet-install.sh" do + source "https://dot.net/v1/dotnet-install.sh" + mode "0755" end -apt_package 'apt-transport-https' - -remote_file '/opt/packages-microsoft-prod.deb' do - source node['dotnet']['ms_packages_src_url'] - checksum node['dotnet']['ms_packages_src_checksum'] - action :create_if_missing +execute "install_dotnet_10" do + command "/opt/dotnet-install.sh -c 10.0 --install-dir /usr/share/dotnet" + not_if '/usr/share/dotnet/dotnet --version | grep -q "^10\."' end -dpkg_package 'packages-microsoft-prod' do - source '/opt/packages-microsoft-prod.deb' - action :install - notifies :run, 'execute[apt_update]' +link "/usr/bin/dotnet" do + to "/usr/share/dotnet/dotnet" end - -execute 'apt_update' do - command 'apt update' - action :nothing -end - -apt_package 'dotnet-sdk-8.0'