Commit a4a0af5 1 parent 8497e5d commit a4a0af5 Copy full SHA for a4a0af5
File tree 2 files changed +25
-8
lines changed
2 files changed +25
-8
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,21 @@ def proxy_services
19
19
end
20
20
end
21
21
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
+
22
37
proxy_services
23
38
end
24
39
end
Original file line number Diff line number Diff line change 90
90
end
91
91
92
92
# 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 = { }
96
97
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
100
101
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
You can’t perform that action at this time.
0 commit comments