nominatim: remove some dead config options

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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 8eed59556e415b854d03e7dcc8d3d77079e1d6cb..8569c731c21e4122f240a50b26d3afdabe0fe8cf 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -104,7 +104,7 @@ node[:networking][:interfaces].each do |name, interface|
       deviceplan["parameters"]["lacp-rate"] = interface[:bond][:lacprate] if interface[:bond][:lacprate]
     end
 
       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"


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


@@ -166,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


@@ -236,7 +240,7 @@ if node[:networking][:wireguard][:enabled]
       }
     end
 
       }
     end
 

-    search(:node, "roles:mail") do |server|
+    search(:node, "roles:mail OR roles:prometheus") do |server|

       allowed_ips = server.interfaces(:role => :internal).map do |interface|
         "#{interface[:network]}/#{interface[:prefix]}"
       end
       allowed_ips = server.interfaces(:role => :internal).map do |interface|
         "#{interface[:network]}/#{interface[:prefix]}"
       end


@@ -321,7 +325,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


@@ -368,6 +372,13 @@ 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"
 template "/etc/default/shorewall" do
   source "shorewall-default.erb"
   owner "root"


@@ -436,6 +447,14 @@ template "/etc/shorewall/rules" do
   notifies :restart, "service[shorewall]"
 end
 
   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]
 if node[:networking][:firewall][:enabled]
   service "shorewall" do
     action [:enable, :start]