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/subnet.pp | |
| 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/subnet.pp')
| -rw-r--r-- | manifests/subnet.pp | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/manifests/subnet.pp b/manifests/subnet.pp index c0f865b..15afd53 100644 --- a/manifests/subnet.pp +++ b/manifests/subnet.pp @@ -37,7 +37,11 @@ define dhcp::subnet( $is_shared=false) { include dhcp::params - $to_include = "${dhcp::params::config_dir}/hosts.d/${name}.conf" + concat {"${dhcp::params::config_dir}/hosts.d/${name}.conf": + owner => root, + group => root, + mode => '0644', + } file {"${dhcp::params::config_dir}/subnets/${name}.conf": ensure => $ensure, @@ -48,29 +52,29 @@ define dhcp::subnet( } if ! $is_shared { - common::concatfilepart {"dhcp.${name}": - file => "${dhcp::params::config_dir}/dhcpd.conf", - ensure => $ensure, + concat::fragment {"dhcp.${name}": + ensure => $ensure, + target => "${dhcp::params::config_dir}/dhcpd.conf", content => "include \"${dhcp::params::config_dir}/subnets/${name}.conf\";\n", } } else { - common::concatfilepart {"dhcp.${name}": - file => "${dhcp::params::config_dir}/dhcpd.conf", - ensure => absent, + concat::fragment {"dhcp.${name}": + ensure => absent, + target => "${dhcp::params::config_dir}/dhcpd.conf", content => "include \"${dhcp::params::config_dir}/subnets/${name}.conf\";\n", } } - common::concatfilepart {"subnet.${name}.hosts": - file => "${dhcp::params::config_dir}/dhcpd.conf", - ensure => $ensure, + concat::fragment {"subnet.${name}.hosts": + ensure => $ensure, + target => "${dhcp::params::config_dir}/dhcpd.conf", content => "include \"${dhcp::params::config_dir}/hosts.d/${name}.conf\";\n", } - common::concatfilepart {"00.dhcp.${name}.base": - file => $to_include, - ensure => $ensure, + concat::fragment {"00.dhcp.${name}.base": + ensure => $ensure, + target => "${dhcp::params::config_dir}/hosts.d/${name}.conf", content => "# File managed by puppet\n", } } |