[Mageia-sysadm] [774] - allow to override the templates used for zone

[root at mageia.org]

Revision: 774
Author:   misc
Date:     2011-01-13 19:12:24 +0100 (Thu, 13 Jan 2011)
Log Message:
-----------
- allow to override the templates used for zone

Modified Paths:
--------------
    puppet/modules/bind/manifests/init.pp

Modified: puppet/modules/bind/manifests/init.pp
===================================================================
--- puppet/modules/bind/manifests/init.pp	2011-01-13 18:12:22 UTC (rev 773)
+++ puppet/modules/bind/manifests/init.pp	2011-01-13 18:12:24 UTC (rev 774)
@@ -30,31 +30,38 @@
         notify => [Service['named']]
     }
 
-    define zone_master {
-        file { "/var/lib/named/var/named/master/$name.zone":
+    define zone_base($content = false) {
+        if ! $content {
+            $zone_content = template("bind/zones/$name.zone")
+        } else {
+            $zone_content = $content
+        }
+        file { "/var/lib/named/var/named/$zone_subdir/$name.zone":
             ensure => present,
             owner => root,
             group => root,
             mode => 644,
-            content => template("bind/zones/$name.zone"),
+            content => $zone_content,
             require => Package[bind],
             notify => Service[named]
         }
     }
 
-    define zone_reverse {
-        file { "/var/lib/named/var/named/reverse/$name.zone":
-            ensure => present,
-            owner => root,
-            group => root,
-            mode => 644,
-            content => template("bind/zones/$name.zone"),
-            require => Package[bind],
-            notify => Service[named]
+    define zone_master(content = false) {
+        $zone_subdir = "master"
+        zone_base { $name : 
+            content => $content 
         }
     }
 
+    define zone_reverse(content = false) {
+        $zone_subdir = "reverse"
+        zone_base { $name : 
+            content => $content 
+        } 
+    }
 
+
     class bind_master inherits bind_base {
         file { '/var/lib/named/etc/named.conf':
             content => template("bind/named_base.conf", "bind/named_master.conf"),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110113/4a9c611d/attachment.html>