diff options
author | Marcel Haerry <haerry@puzzle.ch> | 2011-08-04 13:39:27 +0200 |
---|---|---|
committer | Marcel Haerry <haerry@puzzle.ch> | 2011-08-04 13:39:27 +0200 |
commit | 8dde08a3acbf2815e0cacdc4121f4f8fa2f6c0e5 (patch) | |
tree | 73153b146eedb931f9d46dddb23cc92e3067b4cb /manifests/managed_file.pp | |
parent | 777f77d360b3ba97f2b35f04bf81fe894196c76d (diff) | |
download | puppet-shorewall-8dde08a3acbf2815e0cacdc4121f4f8fa2f6c0e5.tar.gz puppet-shorewall-8dde08a3acbf2815e0cacdc4121f4f8fa2f6c0e5.tar.bz2 |
refactor things to use the concat module
Diffstat (limited to 'manifests/managed_file.pp')
-rw-r--r-- | manifests/managed_file.pp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/manifests/managed_file.pp b/manifests/managed_file.pp index 548d6f6..2f02c51 100644 --- a/manifests/managed_file.pp +++ b/manifests/managed_file.pp @@ -1,17 +1,15 @@ define shorewall::managed_file () { - $dir = "/var/lib/puppet/modules/shorewall/${name}.d" - concatenated_file { "/var/lib/puppet/modules/shorewall/$name": - dir => $dir, - mode => 0600, - } - file { - "${dir}/000-header": - source => "puppet:///modules/shorewall/boilerplate/${name}.header", - mode => 0600, owner => root, group => 0, - notify => Exec["concat_${dir}"]; - "${dir}/999-footer": - source => "puppet:///modules/shorewall/boilerplate/${name}.footer", - mode => 0600, owner => root, group => 0, - notify => Exec["concat_${dir}"]; - } + concat{ "/etc/shorewall/puppet/$name": + notify => Service['shorewall'], + require => File['/etc/shorewall/puppet'], + owner => root, group => 0, mode => 0600; + } + concat::fragment { + "${name}-header": + source => "puppet:///modules/shorewall/boilerplate/${name}.header", + order => '000'; + "${name}-footer": + source => "puppet:///modules/shorewall/boilerplate/${name}.footer", + order => '999'; + } } |