Fix rubocop warnings

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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index bd8517087e49913b6bda13b1df32d2ae3e8683d6..9bf8345222393787a066ed0401c9c192cf6d7d70 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -23,6 +23,8 @@
 require "ipaddr"
 require "yaml"
 
 require "ipaddr"
 require "yaml"
 

+keys = data_bag_item("networking", "keys")
+

 package "netplan.io"
 
 netplan = {
 package "netplan.io"
 
 netplan = {


@@ -39,19 +41,21 @@ node[:networking][:interfaces].each do |name, interface|
   if interface[:interface]
     if interface[:role] && (role = node[:networking][:roles][interface[:role]])
       if role[interface[:family]]
   if interface[:interface]
     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]
-        node.normal[:networking][:interfaces][name][:routes] = role[interface[:family]][:routes]
+        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
 
       end
 

-      node.normal[:networking][:interfaces][name][:metric] = role[:metric]
-      node.normal[:networking][:interfaces][name][:zone] = role[:zone]
+      node.default[:networking][:interfaces][name][:metric] = role[:metric]
+      node.default[:networking][:interfaces][name][:zone] = role[:zone]

     end
 
     end
 

-    prefix = node[:networking][:interfaces][name][:prefix]
+    if interface[:address]
+      prefix = node[:networking][:interfaces][name][: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)
+      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]
 
 
     interface = node[:networking][:interfaces][name]
 


@@ -77,7 +81,9 @@ node[:networking][:interfaces].each do |name, interface|
                    }
                  end
 
                    }
                  end
 

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

 
     if interface[:mtu]
       deviceplan["mtu"] = interface[:mtu]
 
     if interface[:mtu]
       deviceplan["mtu"] = interface[:mtu]


@@ -88,17 +94,17 @@ 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[:gateway] && interface[:gateway] != interface[:address]

       if interface[:family] == "inet"
         default_route = "0.0.0.0/0"
       elsif interface[:family] == "inet6"
       if interface[:family] == "inet"
         default_route = "0.0.0.0/0"
       elsif interface[:family] == "inet6"


@@ -130,6 +136,8 @@ node[:networking][:interfaces].each do |name, interface|
 
     if interface[:routes]
       interface[:routes].each do |to, parameters|
 
     if interface[:routes]
       interface[:routes].each do |to, parameters|

+        next if parameters[:via] == interface[:address]
+

         route = {
           "to" => to
         }
         route = {
           "to" => to
         }


@@ -148,7 +156,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
 


@@ -158,6 +166,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


@@ -169,7 +181,7 @@ end
 file "/etc/netplan/99-chef.yaml" do
   owner "root"
   group "root"
 file "/etc/netplan/99-chef.yaml" do
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   content YAML.dump(netplan)
 end
 
   content YAML.dump(netplan)
 end
 


@@ -177,24 +189,170 @@ package "cloud-init" do
   action :purge
 end
 
   action :purge
 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
+    options "--no-install-recommends"
+  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 0o644
-  notifies :run, "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 0o644
+  mode "644"
+  not_if { kitchen? }

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


@@ -204,54 +362,25 @@ end
 directory "/etc/systemd/resolved.conf.d" do
   owner "root"
   group "root"
 directory "/etc/systemd/resolved.conf.d" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 template "/etc/systemd/resolved.conf.d/99-chef.conf" do
   source "resolved.conf.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/systemd/resolved.conf.d/99-chef.conf" do
   source "resolved.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
-  notifies :restart, "service[systemd-resolved]"
+  mode "644"
+  notifies :restart, "service[systemd-resolved]", :immediately

 end
 
 end
 

-if node[:networking][:tcp_fastopen_key]
-  fastopen_keys = data_bag_item("networking", "fastopen")
-
-  node.normal[:sysctl][:tcp_fastopen] = {
-    :comment => "Set shared key for TCP fast open",
-    :parameters => {
-      "net.ipv4.tcp_fastopen_key" => fastopen_keys[node[:networking][:tcp_fastopen_key]]
-    }
-  }
+if node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"]
+  execute "umount-resolve-conf" do
+    command "umount -c /etc/resolv.conf"
+  end

 end
 
 end
 

-node.interfaces(:role => :internal) do |interface|
-  if interface[:gateway] && interface[:gateway] != interface[:address]
-    search(:node, "networking_interfaces*address:#{interface[:gateway]}") do |gateway|
-      next unless 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
-
-        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
+link "/etc/resolv.conf" do
+  to "../run/systemd/resolve/stub-resolv.conf"

 end
 
 zones = {}
 end
 
 zones = {}


@@ -270,11 +399,18 @@ end
 
 package "shorewall"
 
 
 package "shorewall"
 

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

-  mode 0o644
+  mode "644"

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


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

-  mode 0o644
+  mode "644"

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


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

-  mode 0o644
+  mode "644"

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


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

-  mode 0o644
+  mode "644"

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


@@ -307,7 +443,7 @@ template "/etc/shorewall/hosts" do
   source "shorewall-hosts.erb"
   owner "root"
   group "root"
   source "shorewall-hosts.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

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


@@ -316,7 +452,7 @@ template "/etc/shorewall/conntrack" do
   source "shorewall-conntrack.erb"
   owner "root"
   group "root"
   source "shorewall-conntrack.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   notifies :restart, "service[shorewall]"
   only_if { node[:networking][:firewall][:raw] }
 end
   notifies :restart, "service[shorewall]"
   only_if { node[:networking][:firewall][:raw] }
 end


@@ -325,7 +461,7 @@ template "/etc/shorewall/policy" do
   source "shorewall-policy.erb"
   owner "root"
   group "root"
   source "shorewall-policy.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

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


@@ -333,22 +469,40 @@ template "/etc/shorewall/rules" do
   source "shorewall-rules.erb"
   owner "root"
   group "root"
   source "shorewall-rules.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   variables :family => "inet"
   notifies :restart, "service[shorewall]"
 end
 
   variables :family => "inet"
   notifies :restart, "service[shorewall]"
 end
 

-service "shorewall" do
-  action [:enable, :start]
-  supports :restart => true
-  status_command "shorewall status"
+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"
 end
 
 template "/etc/logrotate.d/shorewall" do
   source "logrotate.shorewall.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   variables :name => "shorewall"
 end
 
   variables :name => "shorewall"
 end
 


@@ -362,27 +516,41 @@ firewall_rule "limit-icmp-echo" do
   rate_limit "s:1/sec:5"
 end
 
   rate_limit "s:1/sec:5"
 end
 

-%w[ucl ams 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

-    source zone
+    source wireguard_source

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

-    dest_ports "1194:1197"
-    source_ports "1194:1197"
+    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 0o644
+    mode "644"

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

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

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


@@ -395,7 +563,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-default.erb"
     owner "root"
     group "root"
     source "shorewall-default.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

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


@@ -403,7 +571,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6.conf.erb"
     owner "root"
     group "root"
     source "shorewall6.conf.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

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


@@ -411,7 +579,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-zones.erb"
     owner "root"
     group "root"
     source "shorewall-zones.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

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


@@ -420,7 +588,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"
     source "shorewall6-interfaces.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

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


@@ -428,7 +596,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"
     source "shorewall6-hosts.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

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


@@ -437,7 +605,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-conntrack.erb"
     owner "root"
     group "root"
     source "shorewall-conntrack.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     notifies :restart, "service[shorewall6]"
     only_if { node[:networking][:firewall][:raw] }
   end
     notifies :restart, "service[shorewall6]"
     only_if { node[:networking][:firewall][:raw] }
   end


@@ -446,7 +614,7 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-policy.erb"
     owner "root"
     group "root"
     source "shorewall-policy.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

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


@@ -454,22 +622,32 @@ unless node.interfaces(:family => :inet6).empty?
     source "shorewall-rules.erb"
     owner "root"
     group "root"
     source "shorewall-rules.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables :family => "inet6"
     notifies :restart, "service[shorewall6]"
   end
 
     variables :family => "inet6"
     notifies :restart, "service[shorewall6]"
   end
 

-  service "shorewall6" do
-    action [:enable, :start]
-    supports :restart => true
-    status_command "shorewall6 status"
+  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"
   end
 
   template "/etc/logrotate.d/shorewall6" do
     source "logrotate.shorewall.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables :name => "shorewall6"
   end
 
     variables :name => "shorewall6"
   end