dhcp::server::base - purge unused data from dhcpd.conf.d directory, added missing...

diff --git a/manifests/classes/dhcp-server-base.pp b/manifests/classes/dhcp-server-base.pp
index 34639a75349fb588dad903790610717ddf9f3556..1725b36d4e15651f47ba88af5f39c2c10a72f874 100644 (file)
--- 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"
   }
 
 }