diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2010-11-12 22:36:51 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2010-11-12 22:36:51 +0000 |
| commit | f51b438ccdac881b1bd723e78dd9a083ce1bfb54 (patch) | |
| tree | 1ffa2f5e672a138fcdff5a58a6d4ec4526973ee8 /modules/shorewall | |
| parent | 8e688e60fd7c79e9702acfdaf2d724d45b7981a8 (diff) | |
| download | puppet-f51b438ccdac881b1bd723e78dd9a083ce1bfb54.tar puppet-f51b438ccdac881b1bd723e78dd9a083ce1bfb54.tar.gz puppet-f51b438ccdac881b1bd723e78dd9a083ce1bfb54.tar.bz2 puppet-f51b438ccdac881b1bd723e78dd9a083ce1bfb54.tar.xz puppet-f51b438ccdac881b1bd723e78dd9a083ce1bfb54.zip | |
don't use a variable for shorewall dir (not working)
Diffstat (limited to 'modules/shorewall')
| -rw-r--r-- | modules/shorewall/manifests/init.pp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/modules/shorewall/manifests/init.pp b/modules/shorewall/manifests/init.pp index d2eef0bb..7c8e1f55 100644 --- a/modules/shorewall/manifests/init.pp +++ b/modules/shorewall/manifests/init.pp @@ -1,10 +1,8 @@ class shorewall { include concat::setup - $shorewalldir = "/tmp/shorewall" - define shorewallfile () { - $filename = "${shorewalldir}/${name}" + $filename = "/tmp/shorewall/${name}" $header = "puppet:///modules/shorewall/headers/${name}" $footer = "puppet:///modules/shorewall/footers/${name}" concat{$filename: @@ -29,7 +27,7 @@ class shorewall { ### Rules shorewallfile{ rules: } define rule_line($order = 50) { - $filename = "${shorewalldir}/rules" + $filename = "/tmp/shorewall/rules" $line = "${name}\n" concat::fragment{"newline_${name}": target => $filename, @@ -56,7 +54,7 @@ class shorewall { ### Zones shorewallfile{ zones: } define zone_line($order = 50) { - $filename = "${shorewalldir}/zones" + $filename = "/tmp/shorewall/zones" $line = "${name}\n" concat::fragment{"newline_${name}": target => $filename, @@ -76,7 +74,7 @@ class shorewall { ### Policy shorewallfile{ policy: } define policy_line($order = 50) { - $filename = "${shorewalldir}/policy" + $filename = "/tmp/shorewall/policy" $line = "${name}\n" concat::fragment{"newline_${name}": target => $filename, |