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 04df2495f43b1847314a65ffe9d37927f90fcaad..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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -22,28 +22,39 @@
 
 require "ipaddr"
 
 
 require "ipaddr"
 

-node[:networking][:interfaces].each do |name,interface|
-  if interface[:role] and 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]
-    end
+network_packages = []

 
 

-    node.default[:networking][:interfaces][name][:metric] = role[:metric]
-    node.default[:networking][:interfaces][name][:zone] = role[:zone]
-  end
+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

 
 

-  prefix = node[:networking][:interfaces][name][:prefix]
+      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)
+  else
+    node.rm(:networking, :interfaces, name)
+  end

 end
 
 end
 

+package network_packages
+

 template "/etc/network/interfaces" do
   source "interfaces.erb"
   owner "root"
   group "root"
 template "/etc/network/interfaces" do
   source "interfaces.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 execute "hostname" do
 end
 
 execute "hostname" do


@@ -55,7 +66,7 @@ template "/etc/hostname" do
   source "hostname.erb"
   owner "root"
   group "root"
   source "hostname.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :run, "execute[hostname]"
 end
 
   notifies :run, "execute[hostname]"
 end
 


@@ -63,44 +74,46 @@ template "/etc/hosts" do
   source "hosts.erb"
   owner "root"
   group "root"
   source "hosts.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 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|
 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|
     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

+        end

 
 

-          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
+        next unless tunnel[:peer][:networks]
+
+        tunnel[:peer][:networks].each do |network|
+          route network[:address] do
+            netmask network[:netmask]
+            gateway interface[:gateway]
+            device interface[:interface]

           end
         end
       end
           end
         end
       end


@@ -108,33 +121,27 @@ node.interfaces(:role => :internal) do |interface|
   end
 end
 
   end
 end
 

-zones = Hash.new
+zones = {}

 
 search(:node, "networking:interfaces").collect do |n|
 
 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"
 
   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"
 template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 


@@ -142,7 +149,7 @@ template "/etc/shorewall/shorewall.conf" do
   source "shorewall.conf.erb"
   owner "root"
   group "root"
   source "shorewall.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 


@@ -150,7 +157,7 @@ template "/etc/shorewall/zones" do
   source "shorewall-zones.erb"
   owner "root"
   group "root"
   source "shorewall-zones.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :type => "ipv4"
   notifies :restart, "service[shorewall]"
 end
   variables :type => "ipv4"
   notifies :restart, "service[shorewall]"
 end


@@ -159,7 +166,7 @@ template "/etc/shorewall/interfaces" do
   source "shorewall-interfaces.erb"
   owner "root"
   group "root"
   source "shorewall-interfaces.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 


@@ -167,16 +174,24 @@ template "/etc/shorewall/hosts" do
   source "shorewall-hosts.erb"
   owner "root"
   group "root"
   source "shorewall-hosts.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :zones => zones
   notifies :restart, "service[shorewall]"
 end
 
   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"
 template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[shorewall]"
 end
 
   notifies :restart, "service[shorewall]"
 end
 


@@ -184,11 +199,25 @@ template "/etc/shorewall/rules" do
   source "shorewall-rules.erb"
   owner "root"
   group "root"
   source "shorewall-rules.erb"
   owner "root"
   group "root"

-  mode 0644
-  variables :rules => []
+  mode 0o644
+  variables :family => "inet"

   notifies :restart, "service[shorewall]"
 end
 
   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
 firewall_rule "limit-icmp-echo" do
   action :accept
   family :inet


@@ -199,15 +228,14 @@ firewall_rule "limit-icmp-echo" do
   rate_limit "s:1/sec:5"
 end
 
   rate_limit "s:1/sec:5"
 end
 

-[ "ucl", "ic", "bm" ].each do |zone|
+%w[ucl ams bm].each do |zone|

   firewall_rule "accept-openvpn-#{zone}" do
     action :accept
   firewall_rule "accept-openvpn-#{zone}" do
     action :accept

-    family :inet

     source zone
     dest "fw"
     proto "udp"
     source zone
     dest "fw"
     proto "udp"

-    dest_ports "1194:1196"
-    source_ports "1194:1196"
+    dest_ports "1194:1197"
+    source_ports "1194:1197"

   end
 end
 
   end
 end
 


@@ -216,7 +244,7 @@ if node[:roles].include?("gateway")
     source "shorewall-masq.erb"
     owner "root"
     group "root"
     source "shorewall-masq.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall]"
   end
 else
     notifies :restart, "service[shorewall]"
   end
 else


@@ -226,20 +254,14 @@ else
   end
 end
 
   end
 end
 

-if not node.interfaces(:family => :inet6).empty?
+unless node.interfaces(:family => :inet6).empty?

   package "shorewall6"
 
   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"
   template "/etc/default/shorewall6" do
     source "shorewall-default.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 


@@ -247,7 +269,7 @@ if not node.interfaces(:family => :inet6).empty?
     source "shorewall6.conf.erb"
     owner "root"
     group "root"
     source "shorewall6.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 


@@ -255,7 +277,7 @@ if not node.interfaces(:family => :inet6).empty?
     source "shorewall-zones.erb"
     owner "root"
     group "root"
     source "shorewall-zones.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :type => "ipv6"
     notifies :restart, "service[shorewall6]"
   end
     variables :type => "ipv6"
     notifies :restart, "service[shorewall6]"
   end


@@ -264,7 +286,7 @@ if not node.interfaces(:family => :inet6).empty?
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 


@@ -272,16 +294,24 @@ if not node.interfaces(:family => :inet6).empty?
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :zones => zones
     notifies :restart, "service[shorewall6]"
   end
 
     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"
   template "/etc/shorewall6/policy" do
     source "shorewall-policy.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     notifies :restart, "service[shorewall6]"
   end
 
     notifies :restart, "service[shorewall6]"
   end
 


@@ -289,11 +319,25 @@ if not node.interfaces(:family => :inet6).empty?
     source "shorewall-rules.erb"
     owner "root"
     group "root"
     source "shorewall-rules.erb"
     owner "root"
     group "root"

-    mode 0644
-    variables :rules => []
+    mode 0o644
+    variables :family => "inet6"

     notifies :restart, "service[shorewall6]"
   end
 
     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
   firewall_rule "limit-icmp6-echo" do
     action :accept
     family :inet6


@@ -311,6 +355,8 @@ firewall_rule "accept-http" do
   dest "fw"
   proto "tcp:syn"
   dest_ports "http"
   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
 end
 
 firewall_rule "accept-https" do


@@ -319,4 +365,6 @@ firewall_rule "accept-https" do
   dest "fw"
   proto "tcp:syn"
   dest_ports "https"
   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
 end