From f9995ad7a151d6381f47bf9e11b322e55db9b056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20M=E4kinen?= <tmakinen@foo.sh>
Date: Tue, 15 May 2012 01:00:53 +0300
Subject: [PATCH] Fixed dhcp::server for CentOS 6.

---
 dhcp/manifests/init.pp | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/dhcp/manifests/init.pp b/dhcp/manifests/init.pp
index 1c31758..9323270 100644
--- a/dhcp/manifests/init.pp
+++ b/dhcp/manifests/init.pp
@@ -1,6 +1,28 @@
 
 class dhcp::server::common {
 
+    case $::operatingsystem {
+        "centos": {
+            case $::operatingsystemrelease {
+                /[45]\.[0-9]/: {
+                    $confdir = "/etc"
+                }
+                default: {
+                    $confdir = "/etc/dhcp"
+                }
+            }
+        }
+        "debian","ubuntu": {
+            $confdir = "/etc/dhcp3"
+        }
+        "fedora": {
+            $confdir = "/etc/dhcp"
+        }
+        default: {
+            $confdir = "/etc"
+        }
+    }
+
     package { "dhcp":
         name   => $operatingsystem ? {
             Debian  => "dhcp3-server",
@@ -73,12 +95,8 @@ class dhcp::server::common {
 
 class dhcp::server inherits dhcp::server::common {
 
-    file { "/etc/dhcpd.conf":
-        name   => $operatingsystem ? {
-            debian  => "/etc/dhcp3/dhcpd.conf",
-            ubuntu  => "/etc/dhcp3/dhcpd.conf",
-            default => "/etc/dhcpd.conf",
-        },
+    file { "dhcpd.conf":
+        name   => "${confdir}/dhcpd.conf",
         ensure => present,
         source => [ "puppet:///files/dhcp/dhcpd.conf.${fqdn}",
                     "puppet:///files/dhcp/dhcpd.conf", ],
@@ -110,8 +128,9 @@ class dhcp::server::ldap inherits dhcp::server::common {
         },
     }
 
-    file { "/etc/dhcpd.conf.in":
+    file { "dhcpd.conf.in":
         ensure  => present,
+        name    => "${confdir}/dhcpd.conf.in",
         source  => [ "puppet:///files/dhcp/dhcpd.conf.in.${hostname}",
                      "puppet:///files/dhcp/dhcpd.conf.in", ],
         mode    => "0644",
@@ -125,10 +144,10 @@ class dhcp::server::ldap inherits dhcp::server::common {
 
     exec { "generate-dhcp-conf":
         path    => "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin",
-        command => "dhcpdump.py /etc/dhcpd.conf.in* > /etc/dhcpd.conf",
-        unless  => "dhcpdump.py /etc/dhcpd.conf.in* | diff /etc/dhcpd.conf -",
+        command => "dhcpdump.py ${confdir}/dhcpd.conf.in* > ${confdir}/dhcpd.conf",
+        unless  => "dhcpdump.py ${confdir}/dhcpd.conf.in* | diff ${confdir}/dhcpd.conf -",
         require => [
-          File["/etc/dhcpd.conf.in"],
+          File["dhcpd.conf.in"],
           File["/usr/local/sbin/dhcpdump.py"],
           Class["python"],
           Class["ldap::client"],