Fix templates, zone_xfers can be an array

Author: raphink

manifests/zone.pp

@@ -42,7 +42,6 @@
   validate_string($zone_retry)
   validate_string($zone_expiracy)
   validate_string($zone_ns)
-  validate_string($zone_xfers)
   validate_string($zone_origin)
 
   concat::fragment {"named.local.zone.${name}":

spec/defines/bind_zone_spec.rb

@@ -32,7 +32,7 @@
 
   # Test all string parameters
   [:ensure, :zone_ttl, :zone_contact, :zone_serial, :zone_refresh,
-   :zone_retry, :zone_expiracy, :zone_ns, :zone_xfers,
+   :zone_retry, :zone_expiracy, :zone_ns,
    :zone_origin].each do |p|
     context "when passing wrong type for #{p}" do
       let (:params) { {

templates/default-record.erb

@@ -1,9 +1,9 @@
 <%- @hash_data.sort.each do |host, datas| -%>
 <% if  @record_type == 'PTR' -%>
-<% if datas.fetch('ptr',true) -%>
-<%= require 'ipaddr'; IPAddr.new(datas.fetch('owner')).reverse %>. <%= datas.fetch('ttl', '') %> IN PTR <%= host %>.<%= @ptr_zone %>.
+<% if @datas.fetch('ptr',true) -%>
+<%= require 'ipaddr'; IPAddr.new(datas.fetch('owner')).reverse %>. <%= @datas.fetch('ttl', '') %> IN PTR <%= @host %>.<%= @ptr_zone %>.
 <%- end -%>
 <%- else -%>
-<%= host %> <%= datas.fetch('ttl', '') %> <%=datas.fetch('record_class', 'IN')%> <%= @record_type %> <%= datas.fetch('owner') %>
+<%= @host %> <%= @datas.fetch('ttl', '') %> <%= @datas.fetch('record_class', 'IN') %> <%= @record_type %> <%= @datas.fetch('owner') %>
 <%- end -%>
 <%- end -%>

templates/generate.erb

@@ -1 +1 @@
-$GENERATE <%=range%> <%=lhs%> <%=ttl%> <%=record_class%> <%=record_type%> <%=rhs%> ; <%=name%>
+$GENERATE <%= @range %> <%= @lhs %> <%= @ttl %> <%= @record_class %> <%= @record_type %> <%= @rhs %> ; <%= @name %>

templates/zone-header.erb

@@ -1,12 +1,12 @@
 ; File managed by puppet
-$TTL <%=zone_ttl%>
-@ IN SOA <%=name%>. <%=zone_contact%>. (
-      <%=zone_serial%>  ; serial
-      <%=zone_refresh%> ; refresh
-      <%=zone_retry%>   ; retry
-      <%=zone_expiracy%>; expiracy
-      <%=zone_ttl%> )   ; TTL
-      IN NS <%=zone_ns%>.
-<% if zone_origin -%>
-$ORIGIN <%=zone_origin%>.
+$TTL <%= @zone_ttl %>
+@ IN SOA <%= @name %>. <%= @zone_contact %>. (
+      <%= @zone_serial %>  ; serial
+      <%= @zone_refresh %> ; refresh
+      <%= @zone_retry %>   ; retry
+      <%= @zone_expiracy %>; expiracy
+      <%= @zone_ttl %> )   ; TTL
+      IN NS <%= @zone_ns %>.
+<% if @zone_origin -%>
+$ORIGIN <%= @zone_origin %>.
 <% end -%>

templates/zone-master.erb

@@ -1,12 +1,12 @@
 # File managed by puppet
-zone "<%=name%>" IN {
+zone "<%= @name %>" IN {
   type master;
-  file "/etc/bind/pri/<%=name%>.conf";
-<% if zone_xfers and not zone_xfers.empty? -%>
-  <% if zone_xfers.is_a?(Array) -%>
-  allow-transfer { <%= zone_xfers.join('; ') -%>; };
+  file "/etc/bind/pri/<%= @name %>.conf";
+<% if @zone_xfers and not @zone_xfers.empty? -%>
+  <% if @zone_xfers.is_a?(Array) -%>
+  allow-transfer { <%= @zone_xfers.join('; ') -%>; };
   <% else -%>
-  allow-transfer { <%= zone_xfers %>; };
+  allow-transfer { <%= @zone_xfers %>; };
   <% end -%>
 <% else -%>
   allow-transfer { none; };