Remove bit of config which might have been causing everything to be blocked.

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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 29ea9ad654aca075d558ba75d7734725b1b50a5a..3adc18d6c367846583c92f4e515516b45b518883 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -22,28 +22,35 @@
 
 require "ipaddr"
 
-node[:networking][:interfaces].each do |name,interface|
-  if interface[:role] and role = node[:networking][:roles][interface[:role]]
+network_packages = []
+
+node[:networking][:interfaces].each do |name, interface|
+  network_packages |= ["vlan"] if interface[:interface] =~ /\.\d+$/
+  network_packages |= ["ifenslave"] if interface[:bond]
+
+  if interface[:role] && (role = node[:networking][:roles][interface[:role]])
     if role[interface[:family]]
-      node.default[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
-      node.default[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
+      node.set[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
+      node.set[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
     end
 
-    node.default[:networking][:interfaces][name][:metric] = role[:metric]
-    node.default[:networking][:interfaces][name][:zone] = role[:zone]
+    node.set[:networking][:interfaces][name][:metric] = role[:metric]
+    node.set[:networking][:interfaces][name][:zone] = role[:zone]
   end
 
   prefix = node[:networking][:interfaces][name][:prefix]
 
-  node.default[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
-  node.default[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
+  node.set[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
+  node.set[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
 end
 
+package network_packages
+
 template "/etc/network/interfaces" do
   source "interfaces.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 execute "hostname" do
@@ -55,15 +62,15 @@ template "/etc/hostname" do
   source "hostname.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :run, resources(:execute => "hostname")
+  mode 0o644
+  notifies :run, "execute[hostname]"
 end
 
 template "/etc/hosts" do
   source "hosts.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 link "/etc/resolv.conf" do
@@ -77,30 +84,30 @@ template "/etc/resolv.conf" do
   source "resolv.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 node.interfaces(:role => :internal) do |interface|
-  if interface[:gateway] and interface[:gateway] != interface[:address]
+  if interface[:gateway] && interface[:gateway] != interface[:address]
     search(:node, "networking_interfaces*address:#{interface[:gateway]}") do |gateway|
-      if gateway[:openvpn]
-        gateway[:openvpn][:tunnels].each_value do |tunnel|
-          if tunnel[:peer][:address]
-            route tunnel[:peer][:address] do
-              netmask "255.255.255.255"
-              gateway interface[:gateway]
-              device interface[:interface]
-            end
+      next unless gateway[:openvpn]
+
+      gateway[:openvpn][:tunnels].each_value do |tunnel|
+        if tunnel[:peer][:address] # ~FC023
+          route tunnel[:peer][:address] do
+            netmask "255.255.255.255"
+            gateway interface[:gateway]
+            device interface[:interface]
           end
+        end
+
+        next unless tunnel[:peer][:networks]
 
-          if tunnel[:peer][:networks]
-            tunnel[:peer][:networks].each do |network|
-              route network[:address] do
-                netmask network[:netmask]
-                gateway interface[:gateway]
-                device interface[:interface]
-              end
-            end
+        tunnel[:peer][:networks].each do |network|
+          route network[:address] do
+            netmask network[:netmask]
+            gateway interface[:gateway]
+            device interface[:interface]
           end
         end
       end
@@ -108,85 +115,93 @@ node.interfaces(:role => :internal) do |interface|
   end
 end
 
-zones = Hash.new
+zones = {}
 
 search(:node, "networking:interfaces").collect do |n|
-  if n[:fqdn] != node[:fqdn]
-    n.interfaces.each do |interface|
-      if interface[:role] == "external" and interface[:zone]
-        zones[interface[:zone]] ||= Hash.new
-        zones[interface[:zone]][interface[:family]] ||= Array.new
-        zones[interface[:zone]][interface[:family]] << interface[:address]
-      end
-    end
+  next if n[:fqdn] == node[:fqdn]
+
+  n.interfaces.each do |interface|
+    next unless interface[:role] == "external" && interface[:zone]
+
+    zones[interface[:zone]] ||= {}
+    zones[interface[:zone]][interface[:family]] ||= []
+    zones[interface[:zone]][interface[:family]] << interface[:address]
   end
 end
 
 package "shorewall"
 
-service "shorewall" do
-  action [ :enable, :start ]
-  supports :restart => true
-  status_command "shorewall status"
-end
-
 template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  mode 0o644
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/shorewall.conf" do
   source "shorewall.conf.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  mode 0o644
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/zones" do
   source "shorewall-zones.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :type => "ipv4"
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/interfaces" do
   source "shorewall-interfaces.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  mode 0o644
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/hosts" do
   source "shorewall-hosts.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :zones => zones
-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  mode 0o644
+  notifies :restart, "service[shorewall]"
 end
 
 template "/etc/shorewall/rules" do
   source "shorewall-rules.erb"
   owner "root"
   group "root"
-  mode 0644
-  variables :family => "inet", :rules => []
-  notifies :restart, resources(:service => "shorewall")
+  mode 0o644
+  variables :rules => []
+  notifies :restart, "service[shorewall]"
+end
+
+service "shorewall" do
+  action [:enable, :start]
+  supports :restart => true
+  status_command "shorewall status"
+end
+
+template "/etc/logrotate.d/shorewall" do
+  source "logrotate.shorewall.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+  variables :name => "shorewall"
 end
 
 firewall_rule "limit-icmp-echo" do
@@ -199,15 +214,15 @@ firewall_rule "limit-icmp-echo" do
   rate_limit "s:1/sec:5"
 end
 
-[ "ucl", "ic", "bm" ].each do |zone|
+%w(ucl ic bm aws).each do |zone|
   firewall_rule "accept-openvpn-#{zone}" do
     action :accept
     family :inet
     source zone
     dest "fw"
     proto "udp"
-    dest_ports "1194:1196"
-    source_ports "1194:1196"
+    dest_ports "1194:1197"
+    source_ports "1194:1197"
   end
 end
 
@@ -216,82 +231,90 @@ if node[:roles].include?("gateway")
     source "shorewall-masq.erb"
     owner "root"
     group "root"
-    mode 0644
-    notifies :restart, resources(:service => "shorewall")
+    mode 0o644
+    notifies :restart, "service[shorewall]"
   end
 else
   file "/etc/shorewall/masq" do
     action :delete
-    notifies :restart, resources(:service => "shorewall")
+    notifies :restart, "service[shorewall]"
   end
 end
 
-if not node.interfaces(:family => :inet6).empty?
+unless node.interfaces(:family => :inet6).empty?
   package "shorewall6"
 
-  service "shorewall6" do
-    action [ :enable, :start ]
-    supports :restart => true
-    status_command "shorewall6 status"
-  end
-
   template "/etc/default/shorewall6" do
     source "shorewall-default.erb"
     owner "root"
     group "root"
-    mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    mode 0o644
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/shorewall6.conf" do
     source "shorewall6.conf.erb"
     owner "root"
     group "root"
-    mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    mode 0o644
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/zones" do
     source "shorewall-zones.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :type => "ipv6"
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/interfaces" do
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"
-    mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    mode 0o644
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/hosts" do
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :zones => zones
-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/policy" do
     source "shorewall-policy.erb"
     owner "root"
     group "root"
-    mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    mode 0o644
+    notifies :restart, "service[shorewall6]"
   end
 
   template "/etc/shorewall6/rules" do
     source "shorewall-rules.erb"
     owner "root"
     group "root"
-    mode 0644
-    variables :family => "inet6", :rules => []
-    notifies :restart, resources(:service => "shorewall6")
+    mode 0o644
+    variables :rules => []
+    notifies :restart, "service[shorewall6]"
+  end
+
+  service "shorewall6" do
+    action [:enable, :start]
+    supports :restart => true
+    status_command "shorewall6 status"
+  end
+
+  template "/etc/logrotate.d/shorewall6" do
+    source "logrotate.shorewall.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+    variables :name => "shorewall6"
   end
 
   firewall_rule "limit-icmp6-echo" do