From: Grant Slater <git@firefishy.com>
Date: Wed, 11 Aug 2021 16:26:32 +0000 (+0100)
Subject: Add docker support to shorewall
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/66e3d5c558bc57579f4f3cb51019bbcb2ea75d58?hp=e30c611fafff7e77941db17f57edb274144f747b

Add docker support to shorewall
---

diff --git a/cookbooks/networking/templates/default/shorewall-interfaces.erb b/cookbooks/networking/templates/default/shorewall-interfaces.erb
index b6a721727..3090a47cc 100644
--- a/cookbooks/networking/templates/default/shorewall-interfaces.erb
+++ b/cookbooks/networking/templates/default/shorewall-interfaces.erb
@@ -13,3 +13,4 @@ net	<%= interface[:interface] %>		nosmurfs,tcpflags
 <% end -%>
 <% end -%>
 loc	wg+		nosmurfs,tcpflags
+dock	docker0		bridge
diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index d3d403c95..72e004713 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -4,6 +4,7 @@
 fw		firewall
 loc		<%= @type %>
 net		<%= @type %>
+dock		<%= @type %>
 osm:net		<%= @type %>
 ucl:osm		<%= @type %>
 ams:osm		<%= @type %>
diff --git a/cookbooks/networking/templates/default/shorewall.conf.erb b/cookbooks/networking/templates/default/shorewall.conf.erb
index 290c73fb6..1ec804b04 100644
--- a/cookbooks/networking/templates/default/shorewall.conf.erb
+++ b/cookbooks/networking/templates/default/shorewall.conf.erb
@@ -166,7 +166,7 @@ DETECT_DNAT_IPADDRS=No
 
 DISABLE_IPV6=No
 
-DOCKER=No
+DOCKER=Yes
 
 DONT_LOAD=