Fix deprecation warnings

diff --git a/templates/default-record.erb b/templates/default-record.erb
index 16b839f2756dbcc874d3a1c1f437ce69dc9daf5a..33d8f3d7f72b8566123dea2db2a6d0fb1f4d2b20 100644 (file)
--- a/templates/default-record.erb
+++ b/templates/default-record.erb
@@ -1,5 +1,5 @@
 <% if ttl -%>
-<%=_owner%> <%=ttl%> <%=record_class%> <%=record_type%> <%=host%>
+<%=@_owner%> <%=@ttl%> <%=@record_class%> <%=@record_type%> <%=@host%>
 <% else -%>
-<%=_owner%> <%=record_class%> <%=record_type%> <%=host%>
+<%=@_owner%> <%=@record_class%> <%=@record_type%> <%=@host%>
 <% end -%>

diff --git a/templates/generate.erb b/templates/generate.erb
index 0c158239e2a5e134929a4805ad847978ae7a25be..263ece73e307632600a3e14a2764c91b815c327d 100644 (file)
--- a/templates/generate.erb
+++ b/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%>

diff --git a/templates/mx-record.erb b/templates/mx-record.erb
index a8ec89d753262fc86c992bbd76fcbe36c276f4c4..23b3a8176b352e8af3159a411a7452d0fb7031af 100644 (file)
--- a/templates/mx-record.erb
+++ b/templates/mx-record.erb
@@ -1,5 +1,5 @@
 <% if ttl -%>
-<%=owner%> <%=ttl%> IN MX <%=priority%> <%=host%>
+<%=@owner%> <%=@ttl%> IN MX <%=@priority%> <%=@host%>
 <% else -%>
-<%=owner%> IN MX <%=priority%> <%=host%>
+<%=@owner%> IN MX <%=@priority%> <%=@host%>
 <% end -%>

diff --git a/templates/view.erb b/templates/view.erb
index 6b3e776a714cfb115497f14960fcc19b81a950ca..e44423bd30d43cc699a72ed20ae54eb870c3b6b1 100644 (file)
--- a/templates/view.erb
+++ b/templates/view.erb
@@ -1,5 +1,5 @@
 /* File managed by puppet */
-view "<%= name %>" {
-        match-clients { <%= match_clients %>; };
-        recursion <%= recursion %>;
-        <% if allow_query != false %>allow-query { <%= allow_query %>; }; <% end %>
+view "<%= @name %>" {
+        match-clients { <%= @match_clients %>; };
+        recursion <%= @recursion %>;
+        <% if @allow_query != false %>allow-query { <%= @allow_query %>; }; <% end %>

diff --git a/templates/zone-header.erb b/templates/zone-header.erb
index a9bb7b3a9925bec33f2b71d231a9d1074258d9b8..d5952968f23a92371e4bb1b3842690d9402a5fb5 100644 (file)
--- a/templates/zone-header.erb
+++ b/templates/zone-header.erb
@@ -1,13 +1,13 @@
 ; File managed by puppet
-$TTL <%=zone_ttl%>
+$TTL <%=@zone_ttl%>
 <% if zone_origin -%>
-$ORIGIN <%=zone_origin%>
+$ORIGIN <%=@zone_origin%>
 <% end -%>
-@ IN SOA <%=zone%>. <%=zone_contact%>. (
-      <%=zone_serial%>  ; serial
-      <%=zone_refresh%> ; refresh
-      <%=zone_retry%>   ; retry
-      <%=zone_expiracy%>; expiracy
-      <%=zone_ttl%> )   ; TTL
-      IN NS <%=zone_ns%>.
+@ IN SOA <%=@zone%>. <%=@zone_contact%>. (
+      <%=@zone_serial%>  ; serial
+      <%=@zone_refresh%> ; refresh
+      <%=@zone_retry%>   ; retry
+      <%=@zone_expiracy%>; expiracy
+      <%=@zone_ttl%> )   ; TTL
+      IN NS <%=@zone_ns%>.
 

diff --git a/templates/zone-master.erb b/templates/zone-master.erb
index f66cd7be0edd0636faea36e21299cae432d4aef2..eaabf8ae2e49dc3055e8a84718452f44e36e30b7 100644 (file)
--- a/templates/zone-master.erb
+++ b/templates/zone-master.erb
@@ -1,12 +1,12 @@
 # File managed by puppet
-zone "<%=zone%>" IN {
+zone "<%=@zone%>" 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('; ') -%>; };
+<% 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; };

diff --git a/templates/zone-slave.erb b/templates/zone-slave.erb
index c867428284783fe1baac5f6995fef83132f57e18..d98a22fd0dd10229187352daf0a36978726c57d7 100644 (file)
--- a/templates/zone-slave.erb
+++ b/templates/zone-slave.erb
@@ -1,10 +1,10 @@
 # File managed by puppet
-zone <%=zone%> IN {
+zone <%=@zone%> IN {
   type slave;
-  <% if zone_masters.is_a?(Array) -%>
-  masters { <%= zone_masters.join('; ') -%>; };
+  <% if @zone_masters.is_a?(Array) -%>
+  masters { <%= @zone_masters.join('; ') -%>; };
   <% else -%>
-  masters { <%= zone_masters %>; };
+  masters { <%= @zone_masters %>; };
   <% end -%>
   allow-query { any; };
 };