From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 Sep 2020 16:23:21 +0000 (+0100)
Subject: Remove a few legacy settings
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/1f7623e527fcda92f5e326c99a65515d3a81312f?hp=d0f39d5c13dd3a6717dbe8331d3a6e63ef79ce28

Remove a few legacy settings
---

diff --git a/cookbooks/networking/templates/default/shorewall-interfaces.erb b/cookbooks/networking/templates/default/shorewall-interfaces.erb
index 74d88122f..b6a721727 100644
--- a/cookbooks/networking/templates/default/shorewall-interfaces.erb
+++ b/cookbooks/networking/templates/default/shorewall-interfaces.erb
@@ -12,5 +12,4 @@ net	<%= interface[:interface] %>		nosmurfs,tcpflags
 <% end -%>
 <% end -%>
 <% end -%>
-loc	tun+		nosmurfs,tcpflags
 loc	wg+		nosmurfs,tcpflags
diff --git a/roles/db.rb b/roles/db.rb
index c4bd4cfa4..bb567e240 100644
--- a/roles/db.rb
+++ b/roles/db.rb
@@ -50,7 +50,6 @@ default_attributes(
         :cpu_tuple_cost => "0.1",
         :log_min_duration_statement => "1000",
         :late_authentication_rules => [
-          { :address => "10.0.16.0/20" },
           { :address => "10.0.32.0/20" },
           { :address => "10.0.48.0/20" }
         ]