From d5c5782194f3623332d61bc856727d52d3621149 Mon Sep 17 00:00:00 2001
From: Cédric Jeanneret <cedric.jeanneret@camptocamp.com>
Date: Fri, 5 Nov 2010 14:45:43 +0100
Subject: (dhcp::server::base) updated classname "dhcp::params", and updates
 filenames

---
 manifests/classes/dhcp-server-base.pp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'manifests')

diff --git a/manifests/classes/dhcp-server-base.pp b/manifests/classes/dhcp-server-base.pp
index d997ad1..34639a7 100644
--- a/manifests/classes/dhcp-server-base.pp
+++ b/manifests/classes/dhcp-server-base.pp
@@ -10,25 +10,24 @@ class dhcp::server::base {
   include dhcp::params
   package {"dhcp-server":
     ensure => present,
-    name   => $dhcp::variables::srv_dhcpd,
+    name   => $dhcp::params::srv_dhcpd,
   }
 
   service {"dhcpd":
-    name    => $dhcp::variables::srv_dhcpd,
+    name    => $dhcp::params::srv_dhcpd,
     ensure  => running,
     enable  => true,
     require => Package["dhcp-server"],
   }
 
   common::concatfilepart {"00.dhcp.server.base":
-    file    => "${dhcp::variables::config_dir}/dhcpd.conf",
+    file    => "${dhcp::params::config_dir}/dhcpd.conf",
     ensure  => present,
     require => Package["dhcp-server"],
     notify  => Service["dhcpd"],
   }
 
-  file {"dhcp-subnet-config-dir":
-    path   => "${dhcp::variables::config_dir}/subnets",
+  file {"${dhcp::params::config_dir}/subnets":
     ensure => directory,
     require => Package["dhcp-server"],
     notify  => Service["dhcpd"],
@@ -38,8 +37,7 @@ class dhcp::server::base {
     source  => "puppet:///dhcp/empty"
   }
 
-  file {"dhcp-config-dir":
-    path   => "${dhcp::variables::config_dir}/hosts.d",
+  file {"${dhcp::params::config_dir}/hosts.d":
     ensure => directory,
     require => Package["dhcp-server"],
     recurse => true,
-- 
cgit v1.2.3