Skip to content

Commit a4a0af5

Browse files
committed
fix rbcli service command
1 parent 8497e5d commit a4a0af5

File tree

2 files changed

+25
-8
lines changed

2 files changed

+25
-8
lines changed

resources/libraries/proxy_services.rb

+15
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,21 @@ def proxy_services
1919
end
2020
end
2121

22+
begin
23+
file_services = JSON.parse(File.read('/etc/redborder/services.json'))
24+
rescue Errno::ENOENT, JSON::ParserError => e
25+
Chef::Log.warn("Error loading services from file: #{e.message}")
26+
file_services = {}
27+
end
28+
29+
systemd_services = node.attributes['redborder']['systemdservices']
30+
systemd_services.each do |service_name, systemd_name|
31+
sys_name = systemd_name.join(',')
32+
if file_services.key?(sys_name)
33+
ips_services[service_name] = file_services[sys_name]
34+
end
35+
end
36+
2237
proxy_services
2338
end
2439
end

resources/recipes/prepare_system.rb

+10-8
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,15 @@
9090
end
9191

9292
# Build service list for rbcli
93-
services = node['redborder']['services'] || []
94-
systemd_services = node['redborder']['systemdservices'] || []
95-
service_enablement = {}
93+
unless File.exist?('/etc/redborder/services.json')
94+
services = node['redborder']['services'] || []
95+
systemd_services = node['redborder']['systemdservices'] || []
96+
service_enablement = {}
9697

97-
systemd_services.each do |service_name, systemd_name|
98-
service_enablement[systemd_name.first] = services[service_name]
99-
end
98+
systemd_services.each do |service_name, systemd_name|
99+
service_enablement[systemd_name.first] = services[service_name]
100+
end
100101

101-
Chef::Log.info('Saving services enablement into /etc/redborder/services.json')
102-
File.write('/etc/redborder/services.json', JSON.pretty_generate(service_enablement))
102+
Chef::Log.info('Saving services enablement into /etc/redborder/services.json')
103+
File.write('/etc/redborder/services.json', JSON.pretty_generate(service_enablement))
104+
end

0 commit comments

Comments
 (0)