bind - simplification for bind::* definitions.

namevar can be used as "$owner", if $owner is not set.

diff --git a/manifests/definitions/bind-a.pp b/manifests/definitions/bind-a.pp
index b0947d128f8fff8b599150c7139d0b33878521ff..3f30187ae0b60e0b03015ddb9d7939b36ad67301 100644 (file)
--- a/manifests/definitions/bind-a.pp
+++ b/manifests/definitions/bind-a.pp
@@ -12,7 +12,7 @@ Arguments:
 */
 define bind::a($ensure=present,
     $zone,
-    $owner,
+    $owner=false,
     $host,
     $ttl=false) {
 

diff --git a/manifests/definitions/bind-aaaa.pp b/manifests/definitions/bind-aaaa.pp
index e91e1624f66c800e4c5a40082c3ef83abb3788e2..80291c2c8be4a43ec506a22693976ec66dac9369 100644 (file)
--- a/manifests/definitions/bind-aaaa.pp
+++ b/manifests/definitions/bind-aaaa.pp
@@ -12,7 +12,7 @@ Arguments:
 */
 define bind::aaaa($ensure=present,
     $zone,
-    $owner,
+    $owner=false,
     $host,
     $ttl=false) {
 

diff --git a/manifests/definitions/bind-cname.pp b/manifests/definitions/bind-cname.pp
index d5e8209faba5a903e2a66fdc71e142f8474853cb..c8baeec0710513a800062416415a3a0640dc3f71 100644 (file)
--- a/manifests/definitions/bind-cname.pp
+++ b/manifests/definitions/bind-cname.pp
@@ -12,7 +12,7 @@ Arguments:
 */
 define bind::cname($ensure=present,
     $zone,
-    $owner,
+    $owner=false,
     $host,
     $ttl=false) {
 

diff --git a/manifests/definitions/bind-mx.pp b/manifests/definitions/bind-mx.pp
index 5090932cb0c585f52a479a57c5ff9cbbf5160289..84a2b9f52ce9b76b953eabcc081da87b7c96b9bb 100644 (file)
--- a/manifests/definitions/bind-mx.pp
+++ b/manifests/definitions/bind-mx.pp
@@ -13,11 +13,17 @@ Arguments:
 */
 define bind::mx($ensure=present,
     $zone,
-    $owner,
+    $owner=false,
     $priority,
     $host,
     $ttl=false) {
 
+  if $owner {
+    $_owner = $owner
+  } else {
+    $_owner = $name
+  }
+
   common::concatfilepart{"bind.${name}":
     file    => "/etc/bind/pri/${zone}",
     ensure  => $ensure,

diff --git a/manifests/definitions/bind-ns.pp b/manifests/definitions/bind-ns.pp
index 065575fd3e4de37b8dcfd8cf5df6eedc6110a276..3d07aea30e85f82a164cb99734f62aff0f0ba875 100644 (file)
--- a/manifests/definitions/bind-ns.pp
+++ b/manifests/definitions/bind-ns.pp
@@ -12,7 +12,7 @@ Arguments:
 */
 define bind::ns($ensure=present,
     $zone,
-    $owner,
+    $owner=false,
     $host,
     $ttl=false) {
 

diff --git a/manifests/definitions/bind-record.pp b/manifests/definitions/bind-record.pp
index 5436a99b5cc72c142558e5d76eba295297400e9f..d551d609c93eac11e440f7b49079ccfce0172bbe 100644 (file)
--- a/manifests/definitions/bind-record.pp
+++ b/manifests/definitions/bind-record.pp
@@ -14,12 +14,18 @@ Arguments:
 */
 define bind::record($ensure=present,
     $zone,
-    $owner,
+    $owner=false,
     $host,
     $record_type,
     $record_class='IN',
     $ttl=false) {
 
+  if $owner {
+    $_owner = $owner
+  } else {
+    $_owner = $name
+  }
+
   common::concatfilepart {"${zone}.${record_type}.${name}":
     ensure  => $ensure,
     file    => "/etc/bind/pri/${zone}.conf",

diff --git a/templates/default-record.erb b/templates/default-record.erb
index 112ae2fd254420e9d023eff0a20d2cabf1759fa6..16b839f2756dbcc874d3a1c1f437ce69dc9daf5a 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 -%>