Set up Redis VM, upgrade all cookbooks for Chef 18, major cleanup #496

Merged
raucao merged 28 commits from feature/488-redis_server into master 2023-07-01 12:22:39 +00:00
3 changed files with 49 additions and 58 deletions
Showing only changes of commit 57fdf0723f - Show all commits

View File

@ -74,13 +74,8 @@ node.default['rtl']['revision'] = 'v0.12.1'
node.default['rtl']['host'] = '10.1.1.163' node.default['rtl']['host'] = '10.1.1.163'
node.default['rtl']['port'] = '3000' node.default['rtl']['port'] = '3000'
node.default['lndhub']['repo'] = 'https://gitea.kosmos.org/kosmos/lndhub.git'
node.default['lndhub']['revision'] = 'master'
node.default['lndhub']['port'] = '3023'
node.default['lndhub']['domain'] = 'lndhub.kosmos.org'
node.default['lndhub-go']['repo'] = 'https://github.com/getAlby/lndhub.go.git' node.default['lndhub-go']['repo'] = 'https://github.com/getAlby/lndhub.go.git'
node.default['lndhub-go']['revision'] = '0.12.0' node.default['lndhub-go']['revision'] = '0.14.0'
node.default['lndhub-go']['source_dir'] = '/opt/lndhub-go' node.default['lndhub-go']['source_dir'] = '/opt/lndhub-go'
node.default['lndhub-go']['port'] = 3026 node.default['lndhub-go']['port'] = 3026
node.default['lndhub-go']['domain'] = 'lndhub.kosmos.org' node.default['lndhub-go']['domain'] = 'lndhub.kosmos.org'

View File

@ -7,7 +7,6 @@ long_description 'Installs/configures bitcoin-related software'
version '0.1.0' version '0.1.0'
chef_version '>= 14.0' chef_version '>= 14.0'
depends 'application_javascript'
depends 'ark' depends 'ark'
depends 'backup' depends 'backup'
depends 'firewall' depends 'firewall'

View File

@ -51,31 +51,29 @@ if node['boltz']
rtl_config[:nodes][0][:Settings][:boltzServerUrl] = "https://#{node['boltz']['rest_host']}:#{node['boltz']['rest_port']}" rtl_config[:nodes][0][:Settings][:boltzServerUrl] = "https://#{node['boltz']['rest_host']}:#{node['boltz']['rest_port']}"
end end
application rtl_dir do git rtl_dir do
owner bitcoin_user
group bitcoin_group
git do
user bitcoin_user user bitcoin_user
group bitcoin_group group bitcoin_group
repository node['rtl']['repo'] repository node['rtl']['repo']
revision node['rtl']['revision'] revision node['rtl']['revision']
notifies :restart, "systemd_unit[rtl.service]", :delayed notifies :restart, "systemd_unit[#{app_name}.service]", :delayed
end end
npm_install do execute "npm install" do
cwd rtl_dir
environment "HOME" => rtl_dir
user bitcoin_user user bitcoin_user
end end
file "#{rtl_dir}/RTL-Config.json" do file "#{rtl_dir}/RTL-Config.json" do
owner bitcoin_user owner bitcoin_user
group bitcoin_group group bitcoin_group
mode '0640' mode '0640'
content rtl_config.to_json content rtl_config.to_json
notifies :restart, "systemd_unit[rtl.service]", :delayed notifies :restart, "systemd_unit[#{app_name}.service]", :delayed
end end
systemd_unit 'rtl.service' do systemd_unit "#{app_name}.service" do
content({ content({
Unit: { Unit: {
Description: 'Ride The Lightning', Description: 'Ride The Lightning',
@ -104,7 +102,6 @@ application rtl_dir do
verify false verify false
triggers_reload true triggers_reload true
action [:create, :enable, :start] action [:create, :enable, :start]
end
end end
include_recipe 'firewall' include_recipe 'firewall'