From 1fb5c599400297fffb4d6e77a6dcc647f05b3fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Fri, 20 Jan 2012 14:57:14 +0200
Subject: [PATCH] More DNS fixes for Fedora and CentOS 6.

---
 dns/manifests/init.pp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/dns/manifests/init.pp b/dns/manifests/init.pp
index 3b59f03..23a5297 100644
--- a/dns/manifests/init.pp
+++ b/dns/manifests/init.pp
@@ -58,7 +58,10 @@ class dns::server {
         },
     }
     exec { "rndc-confgen":
-        command => "rndc-confgen -a -t ${chroot}",
+        command => $chroot ? {
+            ""      => "rndc-confgen -r /dev/urandom -a",
+            default => "rndc-confgen -r /dev/urandom -a -t ${chroot}",
+        },
         path    => "/bin:/usr/bin:/sbin:/usr/sbin",
         unless  => "test -s ${chroot}${confdir}/rndc.key",
         require => File["${chroot}${confdir}/rndc.key"],
@@ -114,7 +117,15 @@ class dns::server {
             }
         }
         default: {
-            file { "${chroot}${confdir}/named.conf":
+            file { "named.conf":
+                path    => $operatingsystem ? {
+                    "centos" => $operatingsystemrelease ? {
+                        /^5\..*/ => "${chroot}${confdir}/named.conf",
+                        default  => "/etc/named.conf",
+                    },
+                    "fedora" => "/etc/named.conf",
+                    default  => "${chroot}${confdir}/named.conf",
+                },
                 ensure  => present,
                 source  => [ "puppet:///files/dns/named.conf.${fqdn}",
                              "puppet:///files/dns/named.conf", ],