WIP

infertux · May 30, 2024 · 1948a0b · 1948a0b
1 parent 00f2f7c
commit 1948a0b
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 113 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -13,7 +13,6 @@
 default['bitcoin']['home'] = "/home/#{node['bitcoin']['user']}"
 default['bitcoin']['conf_dir'] = "#{node['bitcoin']['home']}/.bitcoin"
 default['bitcoin']['conf_file'] = "#{node['bitcoin']['conf_dir']}/bitcoin.conf"
-default['bitcoin']['service_file'] = "/usr/lib/systemd/system/#{node['bitcoin']['binary_name']}.service"
 default['bitcoin']['archive_file'] = "#{node['bitcoin']['variant']}.tar.gz"
 default['bitcoin']['archive_path'] = "#{Chef::Config['file_cache_path']}/bitcoin/#{node['bitcoin']['archive_file']}"
 default['bitcoin']['extract_path'] = "#{Chef::Config['file_cache_path']}/bitcoin/#{node['bitcoin']['variant']}"
@@ -28,13 +27,6 @@
 default['bitcoin']['binary']['url']['core']           = "https://bitcoincore.org/bin/bitcoin-core-#{node['bitcoin']['binary']['version']['core']}/bitcoin-#{node['bitcoin']['binary']['version']['core']}-x86_64-linux-gnu.tar.gz"
 default['bitcoin']['binary']['checksum']['core']      = '2a6974c5486f528793c79d42694b5987401e4a43c97f62b1383abf35bcee44a8'
 
-# 'package' recipe
-
-default['bitcoin']['package']['repo_url']['rhel']        = 'https://linux.ringingliberty.com/bitcoin/el7/x86_64/bitcoin-release-4-1.noarch.rpm'
-default['bitcoin']['package']['repo_checksum']['rhel']   = 'dcba5cb150b8af5a2c1ebec2c9d0255c8b5221c1002469f2170a679e60908ec5'
-default['bitcoin']['package']['repo_url']['fedora']      = 'https://linux.ringingliberty.com/bitcoin/f27/x86_64/bitcoin-release-4-1.noarch.rpm'
-default['bitcoin']['package']['repo_checksum']['fedora'] = 'cac67430e1e76b1b740cd7967e0038ba7989c3fde0660a30bfd22a233e33f708'
-
 # 'source' recipe
 
 default['bitcoin']['source']['version']['core']       = '27.0'

diff --git a/recipes/_common.rb b/recipes/_common.rb
@@ -3,10 +3,6 @@
 # Recipe:: _common
 #
 
-unless node['bitcoin']['variant']
-  raise "You must select the variant you wish to install with `node['bitcoin']['variant'] = $variant'. Possible variants are abc, bucash, core, unlimited, and xt."
-end
-
 user node['bitcoin']['user'] do
   home node['bitcoin']['home']
   shell '/bin/sh'

diff --git a/recipes/_systemd.rb b/recipes/_systemd.rb
@@ -3,37 +3,35 @@
 # Recipe:: _systemd
 #
 
-directory File.dirname(node['bitcoin']['service_file']) do
-  user 'root'
-  group 'root'
-  mode '0755'
-  only_if 'test -f /bin/systemctl && /bin/systemctl'
-end
+systemd_unit "#{node['bitcoin']['binary_name']}.service" do
+  content <<~SYSTEMD
+    [Unit]
+    Description=Bitcoin daemon
+    After=network.target
 
-template node['bitcoin']['service_file'] do
-  source "#{node['bitcoin']['binary_name']}.service.erb"
-  owner 'root'
-  group 'root'
-  mode '0644'
-  variables(
-    user: node['bitcoin']['user'],
-    binary_path: node['bitcoin']['binary_path'],
-    conf_dir: node['bitcoin']['conf_dir'],
-  )
-  notifies :run, 'execute[systemd-daemon-reload]', :immediately
-  only_if 'test -f /bin/systemctl && /bin/systemctl'
-end
+    [Service]
+    User=#{node['bitcoin']['user']}
+    Group=#{node['bitcoin']['user']}
 
-service node['bitcoin']['binary_name'] do
-  provider   Chef::Provider::Service::Systemd
-  action     [:enable]
-  subscribes :restart, "template[#{node['bitcoin']['service_file']}]", :delayed
-  subscribes :restart, "template[#{node['bitcoin']['conf_file']}]", :delayed
-  only_if 'test -f /bin/systemctl && /bin/systemctl'
-end
+    Type=forking
+    PIDFile=#{node['bitcoin']['conf_dir']}/bitcoind.pid
+    ExecStart=#{node['bitcoin']['binary_path']} -daemon -pid=#{node['bitcoin']['conf_dir']}/bitcoind.pid
+
+    PrivateTmp=true
+    ProtectHome=true
+    ProtectProc=invisible
+    ProtectSystem=full
+
+    Restart=on-failure
+    TimeoutStopSec=60
+    TimeoutStartSec=5
+    StartLimitInterval=120
+    StartLimitBurst=5
+
+    [Install]
+    WantedBy=multi-user.target
+  SYSTEMD
 
-execute 'systemd-daemon-reload' do
-  action :nothing
-  command 'systemctl daemon-reload'
-  only_if 'test -f /bin/systemctl && /bin/systemctl'
+  action   %i(enable)
+  notifies :restart, "systemd_unit[#{node['bitcoin']['binary_name']}.service]"
 end
diff --git a/recipes/binary.rb b/recipes/binary.rb
@@ -33,4 +33,4 @@
   SCRIPT
 end
 
-include_recipe 'bitcoin::_systemd'
+include_recipe 'bitcoin::_systemd' if systemd?
diff --git a/recipes/package.rb b/recipes/package.rb
diff --git a/recipes/source.rb b/recipes/source.rb
@@ -50,4 +50,4 @@
   SCRIPT
 end
 
-include_recipe 'bitcoin::_systemd'
+include_recipe 'bitcoin::_systemd' if systemd?
diff --git a/templates/default/bitcoind.service.erb b/templates/default/bitcoind.service.erb
diff --git a/test/integration/default/bitcoin_spec.rb b/test/integration/default/bitcoin_spec.rb
@@ -1,4 +1,4 @@
 describe command('sudo -u bitcoin -- bitcoin-cli -version') do
   its('exit_status') { should eq 0 }
-  its('stdout') { should include "Bitcoin Core RPC client" }
+  its('stdout') { should include 'Bitcoin Core RPC client' }
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,4 +33,4 @@ @@
       SCRIPT
     end
-    include_recipe 'bitcoin::_systemd'
+    include_recipe 'bitcoin::_systemd' if systemd?