X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..3a4b1c2078cd515e93a5f1bf8967f380fbd1646f:/cookbooks/openvpn/recipes/default.rb diff --git a/cookbooks/openvpn/recipes/default.rb b/cookbooks/openvpn/recipes/default.rb index cbd45ee65..b1955aa8c 100644 --- a/cookbooks/openvpn/recipes/default.rb +++ b/cookbooks/openvpn/recipes/default.rb @@ -25,7 +25,7 @@ service "openvpn" do ignore_failure true end -node[:openvpn][:tunnels].each do |name,details| +node[:openvpn][:tunnels].each do |name, details| if peer = search(:node, "fqdn:#{details[:peer][:host]}").first if peer[:openvpn] and not details[:peer][:address] node.default[:openvpn][:tunnels][name][:peer][:address] = peer[:openvpn][:address] @@ -46,7 +46,7 @@ node[:openvpn][:tunnels].each do |name,details| creates "/etc/openvpn/#{name}.key" end - if File.exists?("/etc/openvpn/#{name}.key") + if File.exist?("/etc/openvpn/#{name}.key") node.set[:openvpn][:keys][name] = IO.read("/etc/openvpn/#{name}.key") end elsif peer and peer[:openvpn] @@ -69,7 +69,7 @@ node[:openvpn][:tunnels].each do |name,details| :port => node[:openvpn][:tunnels][name][:port], :mode => node[:openvpn][:tunnels][name][:mode], :peer => node[:openvpn][:tunnels][name][:peer] - notifies :restart, resources(:service => "openvpn") + notifies :restart, "service[openvpn]" end else file "/etc/openvpn/#{name}.conf" do