X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..261e7e9cd1a9882faa4ed7087b5902ebafe25988:/cookbooks/networking/recipes/default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index f68522bcf..04df2495f 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -56,7 +56,7 @@ template "/etc/hostname" do
   owner "root"
   group "root"
   mode 0644
-  notifies :run, resources(:execute => "hostname")
+  notifies :run, "execute[hostname]"
 end
 
 template "/etc/hosts" do
@@ -135,7 +135,7 @@ template "/etc/default/shorewall" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/shorewall.conf" do
@@ -143,7 +143,7 @@ template "/etc/shorewall/shorewall.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/zones" do
@@ -152,7 +152,7 @@ template "/etc/shorewall/zones" do
   group "root"
   mode 0644
   variables :type => "ipv4"
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/interfaces" do
@@ -160,7 +160,7 @@ template "/etc/shorewall/interfaces" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/hosts" do
@@ -169,7 +169,7 @@ template "/etc/shorewall/hosts" do
   group "root"
   mode 0644
   variables :zones => zones
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/policy" do
@@ -177,7 +177,7 @@ template "/etc/shorewall/policy" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/rules" do
@@ -185,8 +185,8 @@ template "/etc/shorewall/rules" do
   owner "root"
   group "root"
   mode 0644
-  variables :family => "inet", :rules => []
-  notifies :restart, resources(:service => "shorewall")
+  variables :rules => []
+  notifies :restart, "service[shorewall]"
 end
 
 firewall_rule "limit-icmp-echo" do
@@ -196,11 +196,7 @@ firewall_rule "limit-icmp-echo" do
   dest "fw"
   proto "icmp"
   dest_ports "echo-request"
-  if node[:lsb][:release].to_f >= 10.04
-    rate_limit "s:1/sec:5"
-  else
-    rate_limit "1/sec:5"
-  end
+  rate_limit "s:1/sec:5"
 end
 
 [ "ucl", "ic", "bm" ].each do |zone|
@@ -221,12 +217,12 @@ if node[:roles].include?("gateway")
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall")
+    notifies :restart, "service[shorewall]"
   end
 else
   file "/etc/shorewall/masq" do
     action :delete
-    notifies :restart, resources(:service => "shorewall")
+    notifies :restart, "service[shorewall]"
   end
 end
 
@@ -244,7 +240,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/shorewall6.conf" do
@@ -252,7 +248,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/zones" do
@@ -261,7 +257,7 @@ if not node.interfaces(:family => :inet6).empty?
     group "root"
     mode 0644
     variables :type => "ipv6"
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/interfaces" do
@@ -269,7 +265,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/hosts" do
@@ -278,7 +274,7 @@ if not node.interfaces(:family => :inet6).empty?
     group "root"
     mode 0644
     variables :zones => zones
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/policy" do
@@ -286,7 +282,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/rules" do
@@ -294,8 +290,8 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    variables :family => "inet6", :rules => []
-    notifies :restart, resources(:service => "shorewall6")
+    variables :rules => []
+    notifies :restart, "service[shorewall6]"
   end
 
   firewall_rule "limit-icmp6-echo" do
@@ -305,11 +301,7 @@ if not node.interfaces(:family => :inet6).empty?
     dest "fw"
     proto "ipv6-icmp"
     dest_ports "echo-request"
-    if node[:lsb][:release].to_f >= 10.04
-      rate_limit "s:1/sec:5"
-    else
-      rate_limit "1/sec:5"
-    end
+    rate_limit "s:1/sec:5"
   end
 end