From: Tom Hughes <tom@compton.nu>
Date: Thu, 10 Jul 2014 12:48:40 +0000 (+0100)
Subject: Shorten shorewall zone name
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fa4f76710511f84d19bb311a833dbb10c928d94f?ds=sidebyside

Shorten shorewall zone name
---

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index 048d5ae76..2de26df69 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -21,4 +21,4 @@ hz:osm		<%= @type %>
 bh:osm		<%= @type %>
 dt:osm		<%= @type %>
 nc:osm		<%= @type %>
-osuosl:osm	<%= @type %>
+ool:osm		<%= @type %>
diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index 285c82952..38fcb7e81 100644
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -12,7 +12,7 @@ default_attributes(
         }
       },
       :external => {
-        :zone => "osuosl"
+        :zone => "ool"
       }
     }
   }