diff options
| author | Cédric Jeanneret <cedric.jeanneret@camptocamp.com> | 2010-11-05 14:45:43 +0100 |
|---|---|---|
| committer | Cédric Jeanneret <cedric.jeanneret@camptocamp.com> | 2010-11-05 14:45:43 +0100 |
| commit | d5c5782194f3623332d61bc856727d52d3621149 (patch) | |
| tree | 94969a8554c51b621e6bc0ad72424dcf1b488a8a /manifests | |
| parent | 08359bd89e27e21a8434046861b2045de9e1d389 (diff) | |
| download | puppet-dhcp-d5c5782194f3623332d61bc856727d52d3621149.tar.gz puppet-dhcp-d5c5782194f3623332d61bc856727d52d3621149.tar.bz2 | |
(dhcp::server::base) updated classname "dhcp::params", and updates filenames
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/classes/dhcp-server-base.pp | 12 |
1 files changed, 5 insertions, 7 deletions
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, |