Merge remote-tracking branch 'tigerfell/pr257'

[chef.git] / cookbooks / networking / templates / default / shorewall-zones.erb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index cd207d802909db808ad9f6e9e8f191bde435deae..f4d7a4772365c257c799c57760c5e11f1e7464d7 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -4,27 +4,9 @@
 fw             firewall
 loc            <%= @type %>
 net            <%= @type %>
+dock           <%= @type %>
 osm:net                <%= @type %>
 ucl:osm                <%= @type %>
-ic:osm         <%= @type %>
+ams:osm                <%= @type %>
 bm:osm         <%= @type %>
-ts:osm         <%= @type %>
-yx:osm         <%= @type %>
-ra:osm         <%= @type %>
-pa:osm         <%= @type %>
-bx:osm         <%= @type %>
-ff:osm         <%= @type %>
-pr:osm         <%= @type %>
-ly:osm         <%= @type %>
-ov:osm         <%= @type %>
-hz:osm         <%= @type %>
-bh:osm         <%= @type %>
-dt:osm         <%= @type %>
-nc:osm         <%= @type %>
-ool:osm                <%= @type %>
-cnt:osm                <%= @type %>
-jn:osm         <%= @type %>
-es:osm         <%= @type %>
-sz:osm         <%= @type %>
-ex:osm         <%= @type %>
-dh:osm         <%= @type %>
+dub:osm                <%= @type %>