diff options
| author | Mathieu Bornoz <mathieu.bornoz@camptocamp.com> | 2012-08-02 09:30:21 +0200 |
|---|---|---|
| committer | Mathieu Bornoz <mathieu.bornoz@camptocamp.com> | 2012-08-02 09:30:21 +0200 |
| commit | 536a24852925104df8b9becfcac9d17ac999a5f4 (patch) | |
| tree | dc559110c95876c9f48ba81c0bc89cd43cad8737 /manifests/server | |
| parent | 5f4a22d6775fc091124c95bbb0b891bf95e6043c (diff) | |
| download | puppet-dhcp-536a24852925104df8b9becfcac9d17ac999a5f4.tar.gz puppet-dhcp-536a24852925104df8b9becfcac9d17ac999a5f4.tar.bz2 | |
switch from common::concatfilepart to concat[1]
[1] https://github.com/camptocamp/puppet-concat
Diffstat (limited to 'manifests/server')
| -rw-r--r-- | manifests/server/base.pp | 13 | ||||
| -rw-r--r-- | manifests/server/debian.pp | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/manifests/server/base.pp b/manifests/server/base.pp index 1725b36..53cbd70 100644 --- a/manifests/server/base.pp +++ b/manifests/server/base.pp @@ -7,7 +7,10 @@ This class should be inherited in dhcp::server::$operatingsystem. */ class dhcp::server::base { + include dhcp::params + include concat::setup + package {"dhcp-server": ensure => present, name => $dhcp::params::srv_dhcpd, @@ -20,9 +23,15 @@ class dhcp::server::base { require => Package["dhcp-server"], } - common::concatfilepart {"00.dhcp.server.base": - file => "${dhcp::params::config_dir}/dhcpd.conf", + concat {"${dhcp::params::config_dir}/dhcpd.conf": + owner => root, + group => root, + mode => '0644', + } + + concat::fragment {"00.dhcp.server.base": ensure => present, + target => "${dhcp::params::config_dir}/dhcpd.conf", require => Package["dhcp-server"], notify => Service["dhcpd"], } diff --git a/manifests/server/debian.pp b/manifests/server/debian.pp index 9762384..3cc7508 100644 --- a/manifests/server/debian.pp +++ b/manifests/server/debian.pp @@ -8,7 +8,7 @@ This class should not be included as is, please include "dhcp::server" instead. */ class dhcp::server::debian inherits dhcp::server::base { - Common::Concatfilepart["00.dhcp.server.base"] { + Concat::Fragment["00.dhcp.server.base"] { content => template('dhcp/dhcpd.conf.debian.erb'), } |