X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4b1c2078cd515e93a5f1bf8967f380fbd1646f..b91b489a5f835b5f7d915a528e4fd5b436e505be:/cookbooks/openvpn/recipes/default.rb

diff --git a/cookbooks/openvpn/recipes/default.rb b/cookbooks/openvpn/recipes/default.rb
index b1955aa8c..9b96183ee 100644
--- a/cookbooks/openvpn/recipes/default.rb
+++ b/cookbooks/openvpn/recipes/default.rb
@@ -20,14 +20,16 @@
 package "openvpn"
 
 service "openvpn" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
   ignore_failure true
 end
 
 node[:openvpn][:tunnels].each do |name, details|
-  if peer = search(:node, "fqdn:#{details[:peer][:host]}").first
-    if peer[:openvpn] and not details[:peer][:address]
+  peer = search(:node, "fqdn:#{details[:peer][:host]}").first
+
+  if peer
+    if peer[:openvpn] && !details[:peer][:address]
       node.default[:openvpn][:tunnels][name][:peer][:address] = peer[:openvpn][:address]
     end
 
@@ -49,7 +51,7 @@ node[:openvpn][:tunnels].each do |name, details|
     if File.exist?("/etc/openvpn/#{name}.key")
       node.set[:openvpn][:keys][name] = IO.read("/etc/openvpn/#{name}.key")
     end
-  elsif peer and peer[:openvpn]
+  elsif peer && peer[:openvpn]
     file "/etc/openvpn/#{name}.key" do
       owner "root"
       group "root"
@@ -65,10 +67,10 @@ node[:openvpn][:tunnels].each do |name, details|
       group "root"
       mode 0644
       variables :name => name,
-      :address => node[:openvpn][:address],
-      :port => node[:openvpn][:tunnels][name][:port],
-      :mode => node[:openvpn][:tunnels][name][:mode],
-      :peer => node[:openvpn][:tunnels][name][:peer]
+                :address => node[:openvpn][:address],
+                :port => node[:openvpn][:tunnels][name][:port],
+                :mode => node[:openvpn][:tunnels][name][:mode],
+                :peer => node[:openvpn][:tunnels][name][:peer]
       notifies :restart, "service[openvpn]"
     end
   else