From 97821c14acfd4497b27afc14f6ae3e7ed5315992 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 18 Jan 2012 00:38:27 +0200
Subject: [PATCH] Fixed dns::server for Puppet 2.7

---
 dns/manifests/init.pp | 67 ++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/dns/manifests/init.pp b/dns/manifests/init.pp
index c00e651..6ccdfa3 100644
--- a/dns/manifests/init.pp
+++ b/dns/manifests/init.pp
@@ -72,6 +72,39 @@ class dns::server {
         require => Exec["rndc-confgen"],
     }
 
+    define populate_zones() {
+        $zone = $name
+        file { "${confdir}/db.${zone}":
+            ensure  => present,
+            content => template("dns/db.erb"),
+            mode    => 0640,
+            owner   => "root",
+            group   => "bind",
+            require => Package["bind"],
+            notify  => Service["named"],
+        }
+        file { "${confdir}/db.${zone}-dynamic":
+            ensure  => present,
+            source  => [ "puppet:///files/dns/db.${zone}-dynamic.${homename}",
+                         "puppet:///files/dns/empty", ],
+            mode    => 0640,
+            owner   => "root",
+            group   => "bind",
+            require => Package["bind"],
+            notify  => Service["named"],
+        }
+        file { "${confdir}/db.${zone}-static":
+            ensure  => present,
+            source  => [ "puppet:///files/dns/db.${zone}-static.${homename}",
+                         "puppet:///files/dns/empty", ],
+            mode    => 0640,
+            owner   => "root",
+            group   => "bind",
+            require => Package["bind"],
+            notify  => Service["named"],
+        }
+    }
+
     case $operatingsystem {
         "ubuntu": {
             $ipaddr = $dns_listener_ipaddr
@@ -93,39 +126,7 @@ class dns::server {
                 require => Package["bind"],
                 notify  => Service["named"],
             }
-           define populate_zones {
-             $zone = $name
-             file { "${confdir}/db.${zone}":
-               ensure => present,
-               content => template("dns/db.erb"),
-               mode    => 0640,
-                owner   => "root",
-                group   => "bind",
-                require => Package["bind"],
-                notify  => Service["named"],
-             }
-              file { "${confdir}/db.${zone}-dynamic":
-                ensure => present,
-                source => [ "puppet:///files/dns/db.${zone}-dynamic.${homename}",
-                            "puppet:///files/dns/empty", ],
-                mode    => 0640,
-                owner   => "root",
-                group   => "bind",
-                require => Package["bind"],
-                notify  => Service["named"],
-             }
-              file { "${confdir}/db.${zone}-static":
-                ensure => present,
-                source => [ "puppet:///files/dns/db.${zone}-static.${homename}",
-                           "puppet:///files/dns/empty", ],
-                mode    => 0640,
-                owner   => "root",
-                group   => "bind",
-                require => Package["bind"],
-                notify  => Service["named"],
-             }
-          }
-          populate_zones { $dns_zones: }
+            populate_zones { $dns_zones: }
         }
         default: {
             file { "${confdir}/named.conf":