Only configure a primary slave in active-backup mode

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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 29ea9ad654aca075d558ba75d7734725b1b50a5a..5cdaf91f635fc5bc894e454e6002407e71cfbe71 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -1,15 +1,15 @@
 #
 #

-# Cookbook Name:: networking
+# Cookbook:: networking

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2010, OpenStreetMap Foundation.
-# Copyright 2009, Opscode, Inc.
+# Copyright:: 2010, OpenStreetMap Foundation.
+# Copyright:: 2009, Opscode, Inc.

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,


@@ -21,172 +21,488 @@
 # * node[:networking][:nameservers]
 
 require "ipaddr"
 # * node[:networking][:nameservers]
 
 require "ipaddr"

+require "yaml"
+
+keys = data_bag_item("networking", "keys")
+
+package "netplan.io"
+
+netplan = {
+  "network" => {
+    "version" => 2,
+    "renderer" => "networkd",
+    "ethernets" => {},
+    "bonds" => {},
+    "vlans" => {}
+  }
+}
+
+node[:networking][:interfaces].each do |name, interface|
+  if interface[:interface]
+    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.default[:networking][:interfaces][name][:routes] = role[interface[:family]][:routes]
+      end
+
+      node.default[:networking][:interfaces][name][:metric] = role[:metric]
+      node.default[:networking][:interfaces][name][:zone] = role[:zone]
+    end
+
+    if interface[:address]
+      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)
+    end
+
+    interface = node[:networking][:interfaces][name]
+
+    deviceplan = if interface[:interface] =~ /^(.*)\.(\d+)$/
+                   netplan["network"]["vlans"][interface[:interface]] ||= {
+                     "id" => Regexp.last_match(2).to_i,
+                     "link" => Regexp.last_match(1),
+                     "accept-ra" => false,
+                     "addresses" => [],
+                     "routes" => []
+                   }
+                 elsif interface[:interface] =~ /^bond\d+$/
+                   netplan["network"]["bonds"][interface[:interface]] ||= {
+                     "accept-ra" => false,
+                     "addresses" => [],
+                     "routes" => []
+                   }
+                 else
+                   netplan["network"]["ethernets"][interface[:interface]] ||= {
+                     "accept-ra" => false,
+                     "addresses" => [],
+                     "routes" => []
+                   }
+                 end
+
+    if interface[:address]
+      deviceplan["addresses"].push("#{interface[:address]}/#{prefix}")
+    end
+
+    if interface[:mtu]
+      deviceplan["mtu"] = interface[:mtu]
+    end
+
+    if interface[:bond]
+      deviceplan["interfaces"] = interface[:bond][:slaves].to_a
+
+      deviceplan["parameters"] = {
+        "mode" => interface[:bond][:mode] || "active-backup",
+        "mii-monitor-interval" => interface[:bond][:miimon] || 100,
+        "down-delay" => interface[:bond][:downdelay] || 200,
+        "up-delay" => interface[:bond][:updelay] || 200
+      }
+
+      deviceplan["parameters"]["primary"] = interface[:bond][:slaves].first if deviceplan["parameters"]["mode"] == "active-backup"
+      deviceplan["parameters"]["transmit-hash-policy"] = interface[:bond][:xmithashpolicy] if interface[:bond][:xmithashpolicy]
+      deviceplan["parameters"]["lacp-rate"] = interface[:bond][:lacprate] if interface[:bond][:lacprate]
+    end
+
+    if interface[:gateway] && interface[:gateway] != interface[:address]
+      if interface[:family] == "inet"
+        default_route = "0.0.0.0/0"
+      elsif interface[:family] == "inet6"
+        default_route = "::/0"
+      end
+
+      deviceplan["routes"].push(
+        "to" => default_route,
+        "via" => interface[:gateway],
+        "metric" => interface[:metric],
+        "on-link" => true
+      )
+
+      # This ordering relies on systemd-networkd adding routes
+      # in reverse order and will need moving before the previous
+      # route once that is fixed:
+      #
+      # https://github.com/systemd/systemd/issues/5430
+      # https://github.com/systemd/systemd/pull/10938
+      if interface[:family] == "inet6" &&
+         !interface[:network].include?(interface[:gateway]) &&
+         !IPAddr.new("fe80::/64").include?(interface[:gateway])
+        deviceplan["routes"].push(
+          "to" => interface[:gateway],
+          "scope" => "link"
+        )
+      end
+    end
+
+    if interface[:routes]
+      interface[:routes].each do |to, parameters|
+        next if parameters[:via] == interface[:address]
+
+        route = {
+          "to" => to
+        }

 
 

-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]
+        route["type"] = parameters[:type] if parameters[:type]
+        route["via"] = parameters[:via] if parameters[:via]
+        route["metric"] = parameters[:metric] if parameters[:metric]
+
+        deviceplan["routes"].push(route)
+      end

     end
     end

+  else
+    node.rm(:networking, :interfaces, name)
+  end
+end
+
+netplan["network"]["bonds"].each_value do |bond|
+  bond["interfaces"].each do |interface|
+    netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false, "optional" => true }
+  end
+end

 
 

-    node.default[:networking][:interfaces][name][:metric] = role[:metric]
-    node.default[:networking][:interfaces][name][:zone] = role[:zone]
+netplan["network"]["vlans"].each_value do |vlan|
+  unless vlan["link"] =~ /^bond\d+$/
+    netplan["network"]["ethernets"][vlan["link"]] ||= { "accept-ra" => false }

   end
   end

+end

 
 

-  prefix = node[:networking][:interfaces][name][:prefix]
+file "/etc/netplan/00-installer-config.yaml" do
+  action :delete
+end

 
 

-  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)
+file "/etc/netplan/01-netcfg.yaml" do
+  action :delete

 end
 
 end
 

-template "/etc/network/interfaces" do
-  source "interfaces.erb"
+file "/etc/netplan/50-cloud-init.yaml" do
+  action :delete
+end
+
+file "/etc/netplan/99-chef.yaml" do

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"
+  content YAML.dump(netplan)
+end
+
+package "cloud-init" do
+  action :purge

 end
 
 end
 

-execute "hostname" do
+if node[:networking][:wireguard][:enabled]
+  wireguard_id = persistent_token("networking", "wireguard")
+
+  node.default[:networking][:wireguard][:address] = "fd43:e709:ea6d:1:#{wireguard_id[0, 4]}:#{wireguard_id[4, 4]}:#{wireguard_id[8, 4]}:#{wireguard_id[12, 4]}"
+
+  package "wireguard-tools" do
+    compile_time true
+  end
+
+  directory "/var/lib/systemd/wireguard" do
+    owner "root"
+    group "systemd-network"
+    mode "750"
+    compile_time true
+  end
+
+  file "/var/lib/systemd/wireguard/private.key" do
+    action :create_if_missing
+    owner "root"
+    group "systemd-network"
+    mode "640"
+    content %x(wg genkey)
+    compile_time true
+  end
+
+  node.default[:networking][:wireguard][:public_key] = %x(wg pubkey < /var/lib/systemd/wireguard/private.key).chomp
+
+  file "/var/lib/systemd/wireguard/preshared.key" do
+    action :create_if_missing
+    owner "root"
+    group "systemd-network"
+    mode "640"
+    content keys["wireguard"]
+  end
+
+  if node[:roles].include?("gateway")
+    search(:node, "roles:gateway") do |gateway|
+      next if gateway.name == node.name
+      next unless gateway[:networking][:wireguard] && gateway[:networking][:wireguard][:enabled]
+
+      allowed_ips = gateway.interfaces(:role => :internal).map do |interface|
+        "#{interface[:network]}/#{interface[:prefix]}"
+      end
+
+      node.default[:networking][:wireguard][:peers] << {
+        :public_key => gateway[:networking][:wireguard][:public_key],
+        :allowed_ips => allowed_ips,
+        :endpoint => "#{gateway.name}:51820"
+      }
+    end
+
+    search(:node, "roles:shenron OR roles:prometheus") do |server|
+      allowed_ips = server.interfaces(:role => :internal).map do |interface|
+        "#{interface[:network]}/#{interface[:prefix]}"
+      end
+
+      if server[:networking][:private_address]
+        allowed_ips << "#{server[:networking][:private_address]}/32"
+      end
+
+      node.default[:networking][:wireguard][:peers] << {
+        :public_key => server[:networking][:wireguard][:public_key],
+        :allowed_ips => allowed_ips,
+        :endpoint => "#{server.name}:51820"
+      }
+    end
+
+    node.default[:networking][:wireguard][:peers] << {
+      :public_key => "7Oj9ufNlgidyH/xDc+aHQKMjJPqTmD/ab13agMh6AxA=",
+      :allowed_ips => "10.0.16.1/32",
+      :endpoint => "gate.compton.nu:51820"
+    }
+
+    # Grant home
+    node.default[:networking][:wireguard][:peers] << {
+      :public_key => "RofATnvlWxP3mt87+QKRXFE5MVxtoCcTsJ+yftZYEE4=",
+      :allowed_ips => "10.89.122.1/32",
+      :endpoint => "gate.firefishy.com:51820"
+    }
+
+    # Grant roaming
+    node.default[:networking][:wireguard][:peers] << {
+      :public_key => "YbUkREE9TAmomqgL/4Fh2e5u2Hh7drN/2o5qg3ndRxg=",
+      :allowed_ips => "10.89.123.1/32",
+      :endpoint => "roaming.firefishy.com:51820"
+    }
+  elsif node[:roles].include?("shenron")
+    search(:node, "roles:gateway") do |gateway|
+      allowed_ips = gateway.interfaces(:role => :internal).map do |interface|
+        "#{interface[:network]}/#{interface[:prefix]}"
+      end
+
+      node.default[:networking][:wireguard][:peers] << {
+        :public_key => gateway[:networking][:wireguard][:public_key],
+        :allowed_ips => allowed_ips,
+        :endpoint => "#{gateway.name}:51820"
+      }
+    end
+  end
+
+  template "/etc/systemd/network/wireguard.netdev" do
+    source "wireguard.netdev.erb"
+    owner "root"
+    group "systemd-network"
+    mode "640"
+  end
+
+  template "/etc/systemd/network/wireguard.network" do
+    source "wireguard.network.erb"
+    owner "root"
+    group "root"
+    mode "644"
+  end
+
+  if node[:lsb][:release].to_f < 20.04
+    execute "ip-link-delete-wg0" do
+      action :nothing
+      command "ip link delete wg0"
+      subscribes :run, "template[/etc/systemd/network/wireguard.netdev]"
+      only_if { ::File.exist?("/sys/class/net/wg0") }
+    end
+
+    service "systemd-networkd" do
+      action :nothing
+      subscribes :restart, "template[/etc/systemd/network/wireguard.netdev]"
+      subscribes :restart, "template[/etc/systemd/network/wireguard.network]"
+      not_if { kitchen? }
+    end
+  else
+    execute "networkctl-delete-wg0" do
+      action :nothing
+      command "networkctl delete wg0"
+      subscribes :run, "template[/etc/systemd/network/wireguard.netdev]"
+      only_if { ::File.exist?("/sys/class/net/wg0") }
+    end
+
+    execute "networkctl-reload" do
+      action :nothing
+      command "networkctl reload"
+      subscribes :run, "template[/etc/systemd/network/wireguard.netdev]"
+      subscribes :run, "template[/etc/systemd/network/wireguard.network]"
+      not_if { kitchen? }
+    end
+  end
+end
+
+ohai "reload-hostname" do

   action :nothing
   action :nothing

-  command "/bin/hostname -F /etc/hostname"
+  plugin "hostname"

 end
 
 end
 

-template "/etc/hostname" do
-  source "hostname.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  notifies :run, resources(:execute => "hostname")
+execute "hostnamectl-set-hostname" do
+  command "hostnamectl set-hostname #{node[:networking][:hostname]}"
+  notifies :reload, "ohai[reload-hostname]"
+  not_if { kitchen? || node[:hostnamectl][:static_hostname] == node[:networking][:hostname] }

 end
 
 template "/etc/hosts" do
   source "hosts.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/hosts" do
   source "hosts.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"
+  not_if { kitchen? }

 end
 
 end
 

-link "/etc/resolv.conf" do
-  action :delete
-  link_type :symbolic
-  to "/run/resolvconf/resolv.conf"
-  only_if { File.symlink?("/etc/resolv.conf") }
+service "systemd-resolved" do
+  action [:enable, :start]

 end
 
 end
 

-template "/etc/resolv.conf" do
-  source "resolv.conf.erb"
+directory "/etc/systemd/resolved.conf.d" do

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode 0644
-end
-
-node.interfaces(:role => :internal) do |interface|
-  if interface[:gateway] and 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
-          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
-          end
-        end
-      end
-    end
+  mode "755"
+end
+
+template "/etc/systemd/resolved.conf.d/99-chef.conf" do
+  source "resolved.conf.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  notifies :restart, "service[systemd-resolved]", :immediately
+end
+
+if node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"]
+  execute "umount-resolve-conf" do
+    command "umount -c /etc/resolv.conf"

   end
 end
 
   end
 end
 

-zones = Hash.new
+link "/etc/resolv.conf" do
+  to "../run/systemd/resolve/stub-resolv.conf"
+end
+
+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"
+systemd_service "shorewall-docker" do
+  service "shorewall"
+  dropin "docker"
+  exec_stop "/sbin/shorewall $OPTIONS stop"
+  notifies :restart, "service[shorewall]"

 end
 
 template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  mode "644"
+  notifies :restart, "service[shorewall]"

 end
 
 template "/etc/shorewall/shorewall.conf" do
   source "shorewall.conf.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/shorewall/shorewall.conf" do
   source "shorewall.conf.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  mode "644"
+  notifies :restart, "service[shorewall]"

 end
 
 template "/etc/shorewall/zones" do
   source "shorewall-zones.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/shorewall/zones" do
   source "shorewall-zones.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"

   variables :type => "ipv4"
   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"
 end
 
 template "/etc/shorewall/interfaces" do
   source "shorewall-interfaces.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  mode "644"
+  notifies :restart, "service[shorewall]"

 end
 
 template "/etc/shorewall/hosts" do
   source "shorewall-hosts.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/shorewall/hosts" do
   source "shorewall-hosts.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"

   variables :zones => zones
   variables :zones => zones

-  notifies :restart, resources(:service => "shorewall")
+  notifies :restart, "service[shorewall]"
+end
+
+template "/etc/shorewall/conntrack" do
+  source "shorewall-conntrack.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  notifies :restart, "service[shorewall]"
+  only_if { node[:networking][:firewall][:raw] }

 end
 
 template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :restart, resources(:service => "shorewall")
+  mode "644"
+  notifies :restart, "service[shorewall]"

 end
 
 template "/etc/shorewall/rules" do
   source "shorewall-rules.erb"
   owner "root"
   group "root"
 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 "644"
+  variables :family => "inet"
+  notifies :restart, "service[shorewall]"
+end
+
+template "/etc/shorewall/stoppedrules" do
+  source "shorewall-stoppedrules.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  notifies :restart, "service[shorewall]"
+end
+
+if node[:networking][:firewall][:enabled]
+  service "shorewall" do
+    action [:enable, :start]
+    supports :restart => true
+    status_command "shorewall status"
+    ignore_failure true
+  end
+else
+  service "shorewall" do
+    action [:disable, :stop]
+    supports :restart => true
+    status_command "shorewall status"
+    ignore_failure true
+  end
+end
+
+template "/etc/logrotate.d/shorewall" do
+  source "logrotate.shorewall.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  variables :name => "shorewall"

 end
 
 firewall_rule "limit-icmp-echo" do
 end
 
 firewall_rule "limit-icmp-echo" do


@@ -199,99 +515,139 @@ 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|
-  firewall_rule "accept-openvpn-#{zone}" do
+if node[:networking][:wireguard][:enabled]
+  wireguard_source = if node[:roles].include?("gateway")
+                       "net"
+                     else
+                       "osm"
+                     end
+
+  firewall_rule "accept-wireguard" do

     action :accept
     action :accept

-    family :inet
-    source zone
+    source wireguard_source

     dest "fw"
     proto "udp"
     dest "fw"
     proto "udp"

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

   end
 end
 
   end
 end
 

+file "/etc/shorewall/masq" do
+  action :delete
+end
+
+file "/etc/shorewall/masq.bak" do
+  action :delete
+end
+

 if node[:roles].include?("gateway")
 if node[:roles].include?("gateway")

-  template "/etc/shorewall/masq" do
-    source "shorewall-masq.erb"
+  template "/etc/shorewall/snat" do
+    source "shorewall-snat.erb"

     owner "root"
     group "root"
     owner "root"
     group "root"

-    mode 0644
-    notifies :restart, resources(:service => "shorewall")
+    mode "644"
+    notifies :restart, "service[shorewall]"

   end
 else
   end
 else

-  file "/etc/shorewall/masq" do
+  file "/etc/shorewall/snat" do

     action :delete
     action :delete

-    notifies :restart, resources(:service => "shorewall")
+    notifies :restart, "service[shorewall]"

   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
-    notifies :restart, resources(:service => "shorewall6")
+    mode "644"
+    notifies :restart, "service[shorewall6]"

   end
 
   template "/etc/shorewall6/shorewall6.conf" do
     source "shorewall6.conf.erb"
     owner "root"
     group "root"
   end
 
   template "/etc/shorewall6/shorewall6.conf" do
     source "shorewall6.conf.erb"
     owner "root"
     group "root"

-    mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    mode "644"
+    notifies :restart, "service[shorewall6]"

   end
 
   template "/etc/shorewall6/zones" do
     source "shorewall-zones.erb"
     owner "root"
     group "root"
   end
 
   template "/etc/shorewall6/zones" do
     source "shorewall-zones.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode "644"

     variables :type => "ipv6"
     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"
   end
 
   template "/etc/shorewall6/interfaces" do
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"

-    mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    mode "644"
+    notifies :restart, "service[shorewall6]"

   end
 
   template "/etc/shorewall6/hosts" do
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"
   end
 
   template "/etc/shorewall6/hosts" do
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode "644"

     variables :zones => zones
     variables :zones => zones

-    notifies :restart, resources(:service => "shorewall6")
+    notifies :restart, "service[shorewall6]"
+  end
+
+  template "/etc/shorewall6/conntrack" do
+    source "shorewall-conntrack.erb"
+    owner "root"
+    group "root"
+    mode "644"
+    notifies :restart, "service[shorewall6]"
+    only_if { node[:networking][:firewall][:raw] }

   end
 
   template "/etc/shorewall6/policy" do
     source "shorewall-policy.erb"
     owner "root"
     group "root"
   end
 
   template "/etc/shorewall6/policy" do
     source "shorewall-policy.erb"
     owner "root"
     group "root"

-    mode 0644
-    notifies :restart, resources(:service => "shorewall6")
+    mode "644"
+    notifies :restart, "service[shorewall6]"

   end
 
   template "/etc/shorewall6/rules" do
     source "shorewall-rules.erb"
     owner "root"
     group "root"
   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 "644"
+    variables :family => "inet6"
+    notifies :restart, "service[shorewall6]"
+  end
+
+  if node[:networking][:firewall][:enabled]
+    service "shorewall6" do
+      action [:enable, :start]
+      supports :restart => true
+      status_command "shorewall6 status"
+      ignore_failure true
+    end
+  else
+    service "shorewall6" do
+      action [:disable, :stop]
+      supports :restart => true
+      status_command "shorewall6 status"
+      ignore_failure true
+    end
+  end
+
+  template "/etc/logrotate.d/shorewall6" do
+    source "logrotate.shorewall.erb"
+    owner "root"
+    group "root"
+    mode "644"
+    variables :name => "shorewall6"

   end
 
   firewall_rule "limit-icmp6-echo" do
   end
 
   firewall_rule "limit-icmp6-echo" do


@@ -311,6 +667,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 +677,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