Improve naming of wireguard configuration files

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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 8eed59556e415b854d03e7dcc8d3d77079e1d6cb..540d858fcfe0eafdb70c7d8361333528d13328b2 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -40,23 +40,22 @@ netplan = {
 node[:networking][:interfaces].each do |name, interface|
   if interface[:interface]
     if interface[:role] && (role = node[:networking][:roles][interface[:role]])
 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]
+      if interface[:inet] && role[:inet]
+        node.default[:networking][:interfaces][name][:inet][:prefix] = role[:inet][:prefix]
+        node.default[:networking][:interfaces][name][:inet][:gateway] = role[:inet][:gateway]
+        node.default[:networking][:interfaces][name][:inet][:routes] = role[:inet][:routes]
+      end
+
+      if interface[:inet6] && role[:inet6]
+        node.default[:networking][:interfaces][name][:inet6][:prefix] = role[:inet6][:prefix]
+        node.default[:networking][:interfaces][name][:inet6][:gateway] = role[:inet6][:gateway]
+        node.default[:networking][:interfaces][name][:inet6][:routes] = role[:inet6][:routes]

       end
 
       node.default[:networking][:interfaces][name][:metric] = role[:metric]
       node.default[:networking][:interfaces][name][:zone] = role[:zone]
     end
 
       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+)$/
     interface = node[:networking][:interfaces][name]
 
     deviceplan = if interface[:interface] =~ /^(.*)\.(\d+)$/


@@ -81,8 +80,12 @@ node[:networking][:interfaces].each do |name, interface|
                    }
                  end
 
                    }
                  end
 

-    if interface[:address]
-      deviceplan["addresses"].push("#{interface[:address]}/#{prefix}")
+    if interface[:inet]
+      deviceplan["addresses"].push("#{interface[:inet][:address]}/#{interface[:inet][:prefix]}")
+    end
+
+    if interface[:inet6]
+      deviceplan["addresses"].push("#{interface[:inet6][:address]}/#{interface[:inet6][:prefix]}")

     end
 
     if interface[:mtu]
     end
 
     if interface[:mtu]


@@ -94,59 +97,81 @@ node[:networking][:interfaces].each do |name, interface|
 
       deviceplan["parameters"] = {
         "mode" => interface[:bond][:mode] || "active-backup",
 
       deviceplan["parameters"] = {
         "mode" => interface[:bond][:mode] || "active-backup",

-        "primary" => interface[:bond][:slaves].first,

         "mii-monitor-interval" => interface[:bond][:miimon] || 100,
         "down-delay" => interface[:bond][:downdelay] || 200,
         "up-delay" => interface[:bond][:updelay] || 200
       }
 
         "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
 
       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]
-      if interface[:family] == "inet"
-        default_route = "0.0.0.0/0"
-      elsif interface[:family] == "inet6"
-        default_route = "::/0"
+    if interface[:inet]
+      if interface[:inet][:gateway] && interface[:inet][:gateway] != interface[:inet][:address]
+        deviceplan["routes"].push(
+          "to" => "0.0.0.0/0",
+          "via" => interface[:inet][:gateway],
+          "metric" => interface[:metric],
+          "on-link" => true
+        )

       end
 
       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])
+      if interface[:inet][:routes]
+        interface[:inet][:routes].each do |to, parameters|
+          next if parameters[:via] == interface[:inet][:address]
+
+          route = {
+            "to" => to
+          }
+
+          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
+
+    if interface[:inet6]
+      if interface[:inet6][:gateway] && interface[:inet6][:gateway] != interface[:inet6][:address]

         deviceplan["routes"].push(
         deviceplan["routes"].push(

-          "to" => interface[:gateway],
-          "scope" => "link"
+          "to" => "::/0",
+          "via" => interface[:inet6][: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 !IPAddr.new(interface[:inet6][:address]).mask(interface[:inet6][:prefix]).include?(interface[:inet6][:gateway]) &&
+           !IPAddr.new("fe80::/64").include?(interface[:inet6][:gateway])
+          deviceplan["routes"].push(
+            "to" => interface[:inet6][:gateway],
+            "scope" => "link"
+          )
+        end

       end
       end

-    end

 
 

-    if interface[:routes]
-      interface[:routes].each do |to, parameters|
-        next if parameters[:via] == interface[:address]
+      if interface[:inet6][:routes]
+        interface[:inet6][:routes].each do |to, parameters|
+          next if parameters[:via] == interface[:inet6][:address]

 
 

-        route = {
-          "to" => to
-        }
+          route = {
+            "to" => to
+          }

 
 

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

       end
     end
   else
       end
     end
   else


@@ -156,7 +181,7 @@ end
 
 netplan["network"]["bonds"].each_value do |bond|
   bond["interfaces"].each do |interface|
 
 netplan["network"]["bonds"].each_value do |bond|
   bond["interfaces"].each do |interface|

-    netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false }
+    netplan["network"]["ethernets"][interface] ||= { "accept-ra" => false, "optional" => true }

   end
 end
 
   end
 end
 


@@ -166,6 +191,10 @@ netplan["network"]["vlans"].each_value do |vlan|
   end
 end
 
   end
 end
 

+file "/etc/netplan/00-installer-config.yaml" do
+  action :delete
+end
+

 file "/etc/netplan/01-netcfg.yaml" do
   action :delete
 end
 file "/etc/netplan/01-netcfg.yaml" do
   action :delete
 end


@@ -192,6 +221,7 @@ if node[:networking][:wireguard][:enabled]
 
   package "wireguard-tools" do
     compile_time true
 
   package "wireguard-tools" do
     compile_time true

+    options "--no-install-recommends"

   end
 
   directory "/var/lib/systemd/wireguard" do
   end
 
   directory "/var/lib/systemd/wireguard" do


@@ -225,9 +255,7 @@ if node[:networking][:wireguard][:enabled]
       next if gateway.name == node.name
       next unless gateway[:networking][:wireguard] && gateway[:networking][:wireguard][:enabled]
 
       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
+      allowed_ips = gateway.ipaddresses(:role => :internal).map(&:subnet)

 
       node.default[:networking][:wireguard][:peers] << {
         :public_key => gateway[:networking][:wireguard][:public_key],
 
       node.default[:networking][:wireguard][:peers] << {
         :public_key => gateway[:networking][:wireguard][:public_key],


@@ -236,10 +264,8 @@ if node[:networking][:wireguard][:enabled]
       }
     end
 
       }
     end
 

-    search(:node, "roles:mail") do |server|
-      allowed_ips = server.interfaces(:role => :internal).map do |interface|
-        "#{interface[:network]}/#{interface[:prefix]}"
-      end
+    search(:node, "roles:prometheus") do |server|
+      allowed_ips = server.ipaddresses(:role => :internal).map(&:subnet)

 
       if server[:networking][:private_address]
         allowed_ips << "#{server[:networking][:private_address]}/32"
 
       if server[:networking][:private_address]
         allowed_ips << "#{server[:networking][:private_address]}/32"


@@ -257,51 +283,67 @@ if node[:networking][:wireguard][:enabled]
       :allowed_ips => "10.0.16.1/32",
       :endpoint => "gate.compton.nu:51820"
     }
       :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.ipaddresses(:role => :internal).map(&:subnet)
+
+      node.default[:networking][:wireguard][:peers] << {
+        :public_key => gateway[:networking][:wireguard][:public_key],
+        :allowed_ips => allowed_ips,
+        :endpoint => "#{gateway.name}:51820"
+      }
+    end
+  end
+
+  file "/etc/systemd/network/wireguard.netdev" do
+    action :delete

   end
 
   end
 

-  template "/etc/systemd/network/wireguard.netdev" do
+  template "/etc/systemd/network/10-wg0.netdev" do

     source "wireguard.netdev.erb"
     owner "root"
     group "systemd-network"
     mode "640"
     source "wireguard.netdev.erb"
     owner "root"
     group "systemd-network"
     mode "640"

+    notifies :run, "execute[networkctl-delete-wg0]"
+    notifies :run, "execute[networkctl-reload]"

   end
 
   end
 

-  template "/etc/systemd/network/wireguard.network" do
+  file "/etc/systemd/network/wireguard.network" do
+    action :delete
+  end
+
+  template "/etc/systemd/network/10-wg0.network" do

     source "wireguard.network.erb"
     owner "root"
     group "root"
     mode "644"
     source "wireguard.network.erb"
     owner "root"
     group "root"
     mode "644"

+    notifies :run, "execute[networkctl-reload]"

   end
 
   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 { ENV.key?("TEST_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-delete-wg0" do
+    action :nothing
+    command "networkctl delete wg0"
+    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 { ENV.key?("TEST_KITCHEN") }
-    end
+  execute "networkctl-reload" do
+    action :nothing
+    command "networkctl reload"
+    not_if { kitchen? }

   end
 end
 
   end
 end
 


@@ -313,7 +355,7 @@ end
 execute "hostnamectl-set-hostname" do
   command "hostnamectl set-hostname #{node[:networking][:hostname]}"
   notifies :reload, "ohai[reload-hostname]"
 execute "hostnamectl-set-hostname" do
   command "hostnamectl set-hostname #{node[:networking][:hostname]}"
   notifies :reload, "ohai[reload-hostname]"

-  not_if { ENV.key?("TEST_KITCHEN") || node[:hostnamectl][:static_hostname] == node[:networking][:hostname] }
+  not_if { kitchen? || node[:hostnamectl][:static_hostname] == node[:networking][:hostname] }

 end
 
 template "/etc/hosts" do
 end
 
 template "/etc/hosts" do


@@ -321,7 +363,7 @@ template "/etc/hosts" do
   owner "root"
   group "root"
   mode "644"
   owner "root"
   group "root"
   mode "644"

-  not_if { ENV["TEST_KITCHEN"] }
+  not_if { kitchen? }

 end
 
 service "systemd-resolved" do
 end
 
 service "systemd-resolved" do


@@ -352,278 +394,89 @@ link "/etc/resolv.conf" do
   to "../run/systemd/resolve/stub-resolv.conf"
 end
 
   to "../run/systemd/resolve/stub-resolv.conf"
 end
 

-zones = {}
+hosts = { :inet => [], :inet6 => [] }

 
 search(:node, "networking:interfaces").collect do |n|
   next if n[:fqdn] == node[:fqdn]
 
   n.interfaces.each do |interface|
 
 search(:node, "networking:interfaces").collect do |n|
   next if n[:fqdn] == node[:fqdn]
 
   n.interfaces.each do |interface|

-    next unless interface[:role] == "external" && interface[:zone]
+    next unless interface[:role] == "external"

 
 

-    zones[interface[:zone]] ||= {}
-    zones[interface[:zone]][interface[:family]] ||= []
-    zones[interface[:zone]][interface[:family]] << interface[:address]
+    hosts[:inet] << interface[:inet][:address] if interface[:inet]
+    hosts[:inet6] << interface[:inet6][:address] if interface[:inet6]

   end
 end
 
   end
 end
 

-package "shorewall"
+package "nftables"

 
 

-template "/etc/default/shorewall" do
-  source "shorewall-default.erb"
-  owner "root"
-  group "root"
-  mode "644"
-  notifies :restart, "service[shorewall]"
-end
-
-template "/etc/shorewall/shorewall.conf" do
-  source "shorewall.conf.erb"
-  owner "root"
-  group "root"
-  mode "644"
-  notifies :restart, "service[shorewall]"
-end
+interfaces = []

 
 

-template "/etc/shorewall/zones" do
-  source "shorewall-zones.erb"
-  owner "root"
-  group "root"
-  mode "644"
-  variables :type => "ipv4"
-  notifies :restart, "service[shorewall]"
+node.interfaces(:role => :external).each do |interface|
+  interfaces << interface[:interface]

 end
 
 end
 

-template "/etc/shorewall/interfaces" do
-  source "shorewall-interfaces.erb"
+template "/etc/nftables.conf" do
+  source "nftables.conf.erb"

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

-  mode "644"
-  notifies :restart, "service[shorewall]"
+  mode "755"
+  variables :interfaces => interfaces, :hosts => hosts
+  notifies :reload, "service[nftables]"

 end
 
 end
 

-template "/etc/shorewall/hosts" do
-  source "shorewall-hosts.erb"
+directory "/var/lib/nftables" do

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

-  mode "644"
-  variables :zones => zones
-  notifies :restart, "service[shorewall]"
+  mode "755"

 end
 
 end
 

-template "/etc/shorewall/conntrack" do
-  source "shorewall-conntrack.erb"
+template "/usr/local/bin/nftables" do
+  source "nftables.erb"

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

-  mode "644"
-  notifies :restart, "service[shorewall]"
-  only_if { node[:networking][:firewall][:raw] }
+  mode "755"

 end
 
 end
 

-template "/etc/shorewall/policy" do
-  source "shorewall-policy.erb"
-  owner "root"
-  group "root"
-  mode "644"
-  notifies :restart, "service[shorewall]"
+systemd_service "nftables-stop" do
+  action :delete
+  service "nftables"
+  dropin "stop"

 end
 
 end
 

-template "/etc/shorewall/rules" do
-  source "shorewall-rules.erb"
-  owner "root"
-  group "root"
-  mode "644"
-  variables :family => "inet"
-  notifies :restart, "service[shorewall]"
+systemd_service "nftables-chef" do
+  service "nftables"
+  dropin "chef"
+  exec_start "/usr/local/bin/nftables start"
+  exec_reload "/usr/local/bin/nftables reload"
+  exec_stop "/usr/local/bin/nftables stop"

 end
 
 if node[:networking][:firewall][:enabled]
 end
 
 if node[:networking][:firewall][:enabled]

-  service "shorewall" do
+  service "nftables" do

     action [:enable, :start]
     action [:enable, :start]

-    supports :restart => true
-    status_command "shorewall status"
-    ignore_failure true

   end
 else
   end
 else

-  service "shorewall" do
+  service "nftables" do

     action [:disable, :stop]
     action [:disable, :stop]

-    supports :restart => true
-    status_command "shorewall status"
-    ignore_failure true

   end
 end
 
   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
-  action :accept
-  family :inet
-  source "net"
-  dest "fw"
-  proto "icmp"
-  dest_ports "echo-request"
-  rate_limit "s:1/sec:5"
-end
-

 if node[:networking][:wireguard][:enabled]
 if node[:networking][:wireguard][:enabled]

-  wireguard_source = if node[:roles].include?("gateway")
-                       "net"
-                     else
-                       "osm"
-                     end
-

   firewall_rule "accept-wireguard" do
     action :accept
   firewall_rule "accept-wireguard" do
     action :accept

-    source wireguard_source
-    dest "fw"
-    proto "udp"
+    context :incoming
+    protocol :udp
+    source :osm unless node[:roles].include?("gateway")

     dest_ports "51820"
     source_ports "51820"
   end
 end
 
     dest_ports "51820"
     source_ports "51820"
   end
 end
 

-if node[:roles].include?("gateway")
-  template "/etc/shorewall/masq" do
-    source "shorewall-masq.erb"
-    owner "root"
-    group "root"
-    mode "644"
-    notifies :restart, "service[shorewall]"
-  end
-else
-  file "/etc/shorewall/masq" do
-    action :delete
-    notifies :restart, "service[shorewall]"
-  end
-end
-
-unless node.interfaces(:family => :inet6).empty?
-  package "shorewall6"
-
-  template "/etc/default/shorewall6" do
-    source "shorewall-default.erb"
-    owner "root"
-    group "root"
-    mode "644"
-    notifies :restart, "service[shorewall6]"
-  end
-
-  template "/etc/shorewall6/shorewall6.conf" do
-    source "shorewall6.conf.erb"
-    owner "root"
-    group "root"
-    mode "644"
-    notifies :restart, "service[shorewall6]"
-  end
-
-  template "/etc/shorewall6/zones" do
-    source "shorewall-zones.erb"
-    owner "root"
-    group "root"
-    mode "644"
-    variables :type => "ipv6"
-    notifies :restart, "service[shorewall6]"
-  end
-
-  template "/etc/shorewall6/interfaces" do
-    source "shorewall6-interfaces.erb"
-    owner "root"
-    group "root"
-    mode "644"
-    notifies :restart, "service[shorewall6]"
-  end
-
-  template "/etc/shorewall6/hosts" do
-    source "shorewall6-hosts.erb"
-    owner "root"
-    group "root"
-    mode "644"
-    variables :zones => zones
-    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"
-    mode "644"
-    notifies :restart, "service[shorewall6]"
-  end
-
-  template "/etc/shorewall6/rules" do
-    source "shorewall-rules.erb"
-    owner "root"
-    group "root"
-    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
-    action :accept
-    family :inet6
-    source "net"
-    dest "fw"
-    proto "ipv6-icmp"
-    dest_ports "echo-request"
-    rate_limit "s:1/sec:5"
-  end
-end
-

 firewall_rule "accept-http" do
   action :accept
 firewall_rule "accept-http" do
   action :accept

-  source "net"
-  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
-  action :accept
-  source "net"
-  dest "fw"
-  proto "tcp:syn"
-  dest_ports "https"
+  context :incoming
+  protocol :tcp
+  dest_ports %w[http https]

   rate_limit node[:networking][:firewall][:http_rate_limit]
   connection_limit node[:networking][:firewall][:http_connection_limit]
 end
   rate_limit node[:networking][:firewall][:http_rate_limit]
   connection_limit node[:networking][:firewall][:http_connection_limit]
 end