Adding zone parameter to bind::zone so the same domains can be defined in different...

diff --git a/manifests/zone.pp b/manifests/zone.pp
index 52a2e5f3e1695b655a4718863d88c069dbb3dbc7..7e1ec71e60a78cba005f9a70b14a74aa315a51f7 100644 (file)
--- a/manifests/zone.pp
+++ b/manifests/zone.pp
@@ -16,6 +16,7 @@
 #  *$zone_origin*: The origin of the zone
 #
 define bind::zone (
 #  *$zone_origin*: The origin of the zone
 #
 define bind::zone (

+  $zone          = $name,

   $ensure        = present,
   $is_slave      = false,
   $zone_ttl      = false,
   $ensure        = present,
   $is_slave      = false,
   $zone_ttl      = false,

diff --git a/templates/zone-header.erb b/templates/zone-header.erb
index 418aef8602c6ca6668fc0cd62ae6f1c31a191d61..a9bb7b3a9925bec33f2b71d231a9d1074258d9b8 100644 (file)
--- a/templates/zone-header.erb
+++ b/templates/zone-header.erb
@@ -3,7 +3,7 @@ $TTL <%=zone_ttl%>
 <% if zone_origin -%>
 $ORIGIN <%=zone_origin%>
 <% end -%>
 <% if zone_origin -%>
 $ORIGIN <%=zone_origin%>
 <% end -%>

-@ IN SOA <%=name%>. <%=zone_contact%>. (
+@ IN SOA <%=zone%>. <%=zone_contact%>. (

       <%=zone_serial%>  ; serial
       <%=zone_refresh%> ; refresh
       <%=zone_retry%>   ; retry
       <%=zone_serial%>  ; serial
       <%=zone_refresh%> ; refresh
       <%=zone_retry%>   ; retry

diff --git a/templates/zone-master.erb b/templates/zone-master.erb
index 2ec3973df85a2b28d2356c146fe93457122655e5..f66cd7be0edd0636faea36e21299cae432d4aef2 100644 (file)
--- a/templates/zone-master.erb
+++ b/templates/zone-master.erb
@@ -1,5 +1,5 @@
 # File managed by puppet
 # File managed by puppet

-zone "<%=name%>" IN {
+zone "<%=zone%>" IN {

   type master;
   file "/etc/bind/pri/<%=name%>.conf";
 <% if zone_xfers and not zone_xfers.empty? -%>
   type master;
   file "/etc/bind/pri/<%=name%>.conf";
 <% if zone_xfers and not zone_xfers.empty? -%>

diff --git a/templates/zone-slave.erb b/templates/zone-slave.erb
index 0ae7e5d03854b5765c77bb2fae08aa7d2b2f7e39..c867428284783fe1baac5f6995fef83132f57e18 100644 (file)
--- a/templates/zone-slave.erb
+++ b/templates/zone-slave.erb
@@ -1,5 +1,5 @@
 # File managed by puppet
 # File managed by puppet

-zone <%=name%> IN {
+zone <%=zone%> IN {

   type slave;
   <% if zone_masters.is_a?(Array) -%>
   masters { <%= zone_masters.join('; ') -%>; };
   type slave;
   <% if zone_masters.is_a?(Array) -%>
   masters { <%= zone_masters.join('; ') -%>; };