From fb0938204019fd14b030605ca8047f1c623bc38c Mon Sep 17 00:00:00 2001
From: Raphaël Pinson <raphael.pinson@camptocamp.com>
Date: Thu, 29 Mar 2012 19:43:18 +0200
Subject: Fix PTR by calculating arpa zones with IPAddr.new(host).reverse

---
 manifests/a.pp    | 8 ++++----
 manifests/zone.pp | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'manifests')

diff --git a/manifests/a.pp b/manifests/a.pp
index 6797ab3..41fdee8 100644
--- a/manifests/a.pp
+++ b/manifests/a.pp
@@ -28,12 +28,12 @@ define bind::a($ensure=present,
   }
 
   if $ptr {
-    $subnet = inline_template("<%= host.split('.')[0,3].join('.') %>") 
-    $number = inline_template("<%= host.split('.')[3] %>")
+    $arpa = inline_template("<%= require 'ipaddr'; IPAddr.new(host).reverse %>")
+    $arpa_zone = inline_template("<%= require 'ipaddr'; IPAddr.new(host).reverse.split('.')[1..-1].join('.') %>")
 
-    bind::ptr {$host:
+    bind::ptr {"${arpa}.":
       ensure => $ensure,
-      zone   => $subnet,
+      zone   => $arpa_zone,
       host   => $name,
       ttl    => $ttl,
     }
diff --git a/manifests/zone.pp b/manifests/zone.pp
index 64da5da..62df7fc 100644
--- a/manifests/zone.pp
+++ b/manifests/zone.pp
@@ -14,6 +14,7 @@ Arguments:
   *$zone_ns*:           Valid NS for this zone (master only)
   *$zone_xfers*:        IPs. Valid xfers for zone (master only)
   *$zone_masters*:      IPs. Valid master for this zone (slave only)
+  *$zone_origin*:       The origin of the zone
 
 */
 define bind::zone($ensure=present,
@@ -26,7 +27,8 @@ define bind::zone($ensure=present,
     $zone_expiracy="1w",
     $zone_ns=false,
     $zone_xfers=false,
-    $zone_masters=false) {
+    $zone_masters=false,
+    $zone_origin=false) {
 
   common::concatfilepart {"bind.zones.${name}":
     ensure  => $ensure,
@@ -69,7 +71,7 @@ define bind::zone($ensure=present,
       content => template("bind/zone-master.erb"),
     }
 
-    common::concatfilepart {"bind.00.${name}":
+    common::concatfilepart {"00.bind.${name}":
       ensure => $ensure,
       file   => "/etc/bind/pri/${name}.conf",
       content => template("bind/zone-header.erb"),
-- 
cgit v1.2.3