imagery: do not fail socket upstreams

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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 67d7bcf3e0ad667324e22fa87bffcd15c4a11c31..51f3f4389aa1eb7dd4ec5f2078080e47131ac6e5 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -9,7 +9,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,33 +22,39 @@
 
 require "ipaddr"
 
-node[:networking][:interfaces].each do |name, interface|
-  if interface[:role] && (role = node[:networking][:roles][interface[:role]])
-    if role[interface[:family]]
-      node.set[:networking][:interfaces][name][:method] = role[interface[:family]][:method]
-      node.set[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
-      node.set[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
-    end
-
-    node.set[:networking][:interfaces][name][:metric] = role[:metric]
-    node.set[:networking][:interfaces][name][:zone] = role[:zone]
-  end
+network_packages = []
 
-  node.set_unless[:networking][:interfaces][name][:method] = "static"
+node[:networking][:interfaces].each do |name, interface|
+  if interface[: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.normal[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
+        node.normal[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
+      end
 
-  next unless interface[:address]
+      node.normal[:networking][:interfaces][name][:metric] = role[:metric]
+      node.normal[:networking][:interfaces][name][:zone] = role[:zone]
+    end
 
-  prefix = node[:networking][:interfaces][name][:prefix]
+    prefix = node[:networking][:interfaces][name][: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)
+    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)
+  else
+    node.rm(:networking, :interfaces, name)
+  end
 end
 
+package network_packages
+
 template "/etc/network/interfaces" do
   source "interfaces.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 execute "hostname" do
@@ -60,7 +66,7 @@ template "/etc/hostname" do
   source "hostname.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :run, "execute[hostname]"
 end
 
@@ -68,21 +74,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|
@@ -129,17 +137,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
 
@@ -147,7 +149,7 @@ template "/etc/shorewall/shorewall.conf" do
   source "shorewall.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -155,7 +157,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
@@ -164,7 +166,7 @@ template "/etc/shorewall/interfaces" do
   source "shorewall-interfaces.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -172,16 +174,24 @@ 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
 
+template "/etc/shorewall/conntrack" do
+  source "shorewall-conntrack.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+  notifies :restart, "service[shorewall]"
+end
+
 template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[shorewall]"
 end
 
@@ -189,16 +199,22 @@ 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 0644
+  mode 0o644
   variables :name => "shorewall"
 end
 
@@ -212,15 +228,14 @@ firewall_rule "limit-icmp-echo" do
   rate_limit "s:1/sec:5"
 end
 
-%w(ucl ic bm).each do |zone|
+%w[ucl ams bm].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
 
@@ -229,7 +244,7 @@ if node[:roles].include?("gateway")
     source "shorewall-masq.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall]"
   end
 else
@@ -242,17 +257,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
 
@@ -260,7 +269,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -268,7 +277,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
@@ -277,7 +286,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -285,16 +294,24 @@ 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
 
+  template "/etc/shorewall6/conntrack" do
+    source "shorewall-conntrack.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+    notifies :restart, "service[shorewall6]"
+  end
+
   template "/etc/shorewall6/policy" do
     source "shorewall-policy.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     notifies :restart, "service[shorewall6]"
   end
 
@@ -302,16 +319,22 @@ 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 0644
+    mode 0o644
     variables :name => "shorewall6"
   end
 
@@ -332,6 +355,8 @@ firewall_rule "accept-http" do
   dest "fw"
   proto "tcp:syn"
   dest_ports "http"
+  rate_limit node[:networking][:firewall][:http_rate_limit]
+  connection_limit node[:networking][:firewall][:http_connection_limit]
 end
 
 firewall_rule "accept-https" do
@@ -340,4 +365,6 @@ firewall_rule "accept-https" do
   dest "fw"
   proto "tcp:syn"
   dest_ports "https"
+  rate_limit node[:networking][:firewall][:http_rate_limit]
+  connection_limit node[:networking][:firewall][:http_connection_limit]
 end