From bfdaac84a4745af9ba442a5bde9b3b30550ea12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 8 Feb 2023 15:31:17 +0800 Subject: [PATCH] Use service DSL --- site-cookbooks/kosmos-bitcoin/recipes/btcpay.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/site-cookbooks/kosmos-bitcoin/recipes/btcpay.rb b/site-cookbooks/kosmos-bitcoin/recipes/btcpay.rb index b6c63c4..c88d7ec 100644 --- a/site-cookbooks/kosmos-bitcoin/recipes/btcpay.rb +++ b/site-cookbooks/kosmos-bitcoin/recipes/btcpay.rb @@ -11,7 +11,7 @@ git node['btcpay']['source_dir'] do repository node['btcpay']['repo'] revision node['btcpay']['revision'] action :sync - notifies :stop, "systemd_unit[btcpayserver.service]", :immediately + notifies :stop, "service[btcpayserver]", :immediately notifies :run, 'bash[build_btcpay]', :immediately end @@ -22,7 +22,7 @@ bash 'build_btcpay' do ./build.sh EOH action :nothing - notifies :restart, "systemd_unit[btcpayserver.service]", :delayed + notifies :restart, "service[btcpayserver]", :delayed end directory "/home/#{node['bitcoin']['username']}/.btcpayserver" do @@ -58,7 +58,7 @@ template node['btcpay']['config_path'] do postgres_user: node['btcpay']['postgres']['user'], postgres_password: credentials['postgres_password'], lnd_admin_macaroon_path: lnd_admin_macaroon_path - notifies :restart, "systemd_unit[btcpayserver.service]", :delayed + notifies :restart, "service[btcpayserver]", :delayed end directory '/run/btcpayserver' do @@ -73,6 +73,7 @@ if node["nbxplorer"]["postgres"] nbxpg_database = node["nbxplorer"]["postgres"]["database"] nbxpg_connect = "User ID=#{nbxpg_user};Password=#{nbxplorer_credentials['postgresql_password']};Database=#{nbxpg_database};Host=pg.kosmos.local;Port=5432;Application Name=btcpayserver;MaxPoolSize=80" end + systemd_unit 'btcpayserver.service' do content({ Unit: { @@ -101,7 +102,11 @@ systemd_unit 'btcpayserver.service' do }) verify false triggers_reload true - action [:create, :enable, :start] + action [:create] +end + +service "btcpayserver" do + action [:enable, :start] end firewall_rule "BTCPay API private access" do