X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f9a223297545b98090c533f10991d60334087fcb..a31229e5ab1291d79d14ac9bf4ad210db4895cea:/cookbooks/networking/recipes/default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 50fa35cfb..e23b1dae3 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -22,23 +22,30 @@
 
 require "ipaddr"
 
+network_packages = []
+
 node[:networking][:interfaces].each do |name, interface|
-  if interface[:role] && role = node[:networking][:roles][interface[:role]]
+  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"
@@ -86,7 +93,7 @@ node.interfaces(:role => :internal) do |interface|
       next unless gateway[:openvpn]
 
       gateway[:openvpn][:tunnels].each_value do |tunnel|
-        if tunnel[:peer][:address]
+        if tunnel[:peer][:address] # ~FC023
           route tunnel[:peer][:address] do
             netmask "255.255.255.255"
             gateway interface[:gateway]
@@ -189,6 +196,14 @@ template "/etc/shorewall/rules" do
   notifies :restart, "service[shorewall]"
 end
 
+template "/etc/logrotate.d/shorewall" do
+  source "logrotate.shorewall.erb"
+  owner "root"
+  group "root"
+  mode 0644
+  variables :name => "shorewall"
+end
+
 firewall_rule "limit-icmp-echo" do
   action :accept
   family :inet
@@ -199,7 +214,7 @@ firewall_rule "limit-icmp-echo" do
   rate_limit "s:1/sec:5"
 end
 
-%w(ucl ic bm).each do |zone|
+%w(ucl ic bm aws).each do |zone|
   firewall_rule "accept-openvpn-#{zone}" do
     action :accept
     family :inet
@@ -294,6 +309,14 @@ unless node.interfaces(:family => :inet6).empty?
     notifies :restart, "service[shorewall6]"
   end
 
+  template "/etc/logrotate.d/shorewall6" do
+    source "logrotate.shorewall.erb"
+    owner "root"
+    group "root"
+    mode 0644
+    variables :name => "shorewall6"
+  end
+
   firewall_rule "limit-icmp6-echo" do
     action :accept
     family :inet6