Expire tiles from both osm.gz and osc.gz files

[chef.git] / cookbooks / openvpn / recipes / default.rb

diff --git a/cookbooks/openvpn/recipes/default.rb b/cookbooks/openvpn/recipes/default.rb
index 3a0bcccf5d7db1bed38dd71c2c5c4a8a7acd8313..29bea6d28528260fb281682e1a706875221a6d0d 100644 (file)
--- a/cookbooks/openvpn/recipes/default.rb
+++ b/cookbooks/openvpn/recipes/default.rb
@@ -20,13 +20,15 @@
 package "openvpn"
 
 service "openvpn" do
 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|
   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
+  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
     if peer[:openvpn] && !details[:peer][:address]
       node.default[:openvpn][:tunnels][name][:peer][:address] = peer[:openvpn][:address]
     end


@@ -47,13 +49,13 @@ node[:openvpn][:tunnels].each do |name, details|
     end
 
     if File.exist?("/etc/openvpn/#{name}.key")
     end
 
     if File.exist?("/etc/openvpn/#{name}.key")

-      node.set[:openvpn][:keys][name] = IO.read("/etc/openvpn/#{name}.key")
+      node.normal[:openvpn][:keys][name] = IO.read("/etc/openvpn/#{name}.key")

     end
   elsif peer && peer[:openvpn]
     file "/etc/openvpn/#{name}.key" do
       owner "root"
       group "root"
     end
   elsif peer && peer[:openvpn]
     file "/etc/openvpn/#{name}.key" do
       owner "root"
       group "root"

-      mode 0600
+      mode 0o600

       content peer[:openvpn][:keys][name]
     end
   end
       content peer[:openvpn][:keys][name]
     end
   end


@@ -63,7 +65,7 @@ node[:openvpn][:tunnels].each do |name, details|
       source "tunnel.conf.erb"
       owner "root"
       group "root"
       source "tunnel.conf.erb"
       owner "root"
       group "root"

-      mode 0644
+      mode 0o644

       variables :name => name,
                 :address => node[:openvpn][:address],
                 :port => node[:openvpn][:tunnels][name][:port],
       variables :name => name,
                 :address => node[:openvpn][:address],
                 :port => node[:openvpn][:tunnels][name][:port],