From 69f887dee39d13f52b7b228fa49e54bdd0454c3b Mon Sep 17 00:00:00 2001
From: Cédric Jeanneret <cedric.jeanneret@camptocamp.com>
Date: Wed, 22 Jun 2011 10:53:51 +0200
Subject: dhcp::server::base - purge unused data from dhcpd.conf.d directory,
 added missing "modules" in file path

---
 manifests/classes/dhcp-server-base.pp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'manifests/classes')

diff --git a/manifests/classes/dhcp-server-base.pp b/manifests/classes/dhcp-server-base.pp
index 34639a7..1725b36 100644
--- a/manifests/classes/dhcp-server-base.pp
+++ b/manifests/classes/dhcp-server-base.pp
@@ -27,6 +27,15 @@ class dhcp::server::base {
     notify  => Service["dhcpd"],
   }
 
+  file {"${dhcp::params::config_dir}/dhcpd.conf.d":
+    ensure => directory,
+    mode   => 0700,
+    recurse => true,
+    purge   => true,
+    force   => true,
+    source  => "puppet:///modules/dhcp/empty"
+  }
+
   file {"${dhcp::params::config_dir}/subnets":
     ensure => directory,
     require => Package["dhcp-server"],
@@ -34,7 +43,7 @@ class dhcp::server::base {
     recurse => true,
     purge   => true,
     force   => true,
-    source  => "puppet:///dhcp/empty"
+    source  => "puppet:///modules/dhcp/empty"
   }
 
   file {"${dhcp::params::config_dir}/hosts.d":
@@ -43,7 +52,7 @@ class dhcp::server::base {
     recurse => true,
     purge   => true,
     force   => true,
-    source  => "puppet:///dhcp/empty"
+    source  => "puppet:///modules/dhcp/empty"
   }
 
 }
-- 
cgit v1.2.3