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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 50fa35cfb..16dd48269 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -22,28 +22,35 @@
 
 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.normal[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
+      node.normal[: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.normal[:networking][:interfaces][name][:metric] = role[:metric]
+    node.normal[: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.normal[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
+  node.normal[: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,7 +62,7 @@ template "/etc/hostname" do
   source "hostname.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :run, "execute[hostname]"
 end
 
@@ -63,21 +70,23 @@ template "/etc/hosts" do
   source "hosts.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
-link "/etc/resolv.conf" do
-  action :delete
-  link_type :symbolic
-  to "/run/resolvconf/resolv.conf"
-  only_if { File.symlink?("/etc/resolv.conf") }
-end
+unless node[:networking][:nameservers].empty?
+  link "/etc/resolv.conf" do
+    action :delete
+    link_type :symbolic
+    to "/run/resolvconf/resolv.conf"
+    only_if { File.symlink?("/etc/resolv.conf") }
+  end
 
-template "/etc/resolv.conf" do
-  source "resolv.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
+  template "/etc/resolv.conf" do
+    source "resolv.conf.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+  end
 end
 
 node.interfaces(:role => :internal) do |interface|
@@ -86,7 +95,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]
@@ -124,17 +133,11 @@ 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
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -142,7 +145,7 @@ template "/etc/shorewall/shorewall.conf" do
   source "shorewall.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -150,7 +153,7 @@ template "/etc/shorewall/zones" do
   source "shorewall-zones.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :type => "ipv4"
   notifies :restart, "service[shorewall]"
 end
@@ -159,7 +162,7 @@ template "/etc/shorewall/interfaces" do
   source "shorewall-interfaces.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -167,7 +170,7 @@ template "/etc/shorewall/hosts" do
   source "shorewall-hosts.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :zones => zones
   notifies :restart, "service[shorewall]"
 end
@@ -176,7 +179,7 @@ template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -184,11 +187,25 @@ template "/etc/shorewall/rules" do
   source "shorewall-rules.erb"
   owner "root"
   group "root"
-  mode 0644
-  variables :rules => []
+  mode 0o644
+  variables :family => "inet"
   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
   action :accept
   family :inet
@@ -199,15 +216,15 @@ 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
     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,7 +233,7 @@ if node[:roles].include?("gateway")
     source "shorewall-masq.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall]"
   end
 else
@@ -229,17 +246,11 @@ end
 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
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -247,7 +258,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -255,7 +266,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-zones.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :type => "ipv6"
     notifies :restart, "service[shorewall6]"
   end
@@ -264,7 +275,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -272,7 +283,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :zones => zones
     notifies :restart, "service[shorewall6]"
   end
@@ -281,7 +292,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-policy.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -289,11 +300,25 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-rules.erb"
     owner "root"
     group "root"
-    mode 0644
-    variables :rules => []
+    mode 0o644
+    variables :family => "inet6"
     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
     action :accept
     family :inet6
@@ -311,6 +336,7 @@ firewall_rule "accept-http" do
   dest "fw"
   proto "tcp:syn"
   dest_ports "http"
+  connection_limit node[:networking][:firewall][:http_connection_limit]
 end
 
 firewall_rule "accept-https" do
@@ -319,4 +345,5 @@ firewall_rule "accept-https" do
   dest "fw"
   proto "tcp:syn"
   dest_ports "https"
+  connection_limit node[:networking][:firewall][:http_connection_limit]
 end