From 0799a91cfc6db96a6b09a806643f41900af211f8 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Fri, 12 Nov 2010 20:57:58 +0000 Subject: change shorewall test dir --- modules/shorewall/manifests/init.pp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'modules/shorewall') diff --git a/modules/shorewall/manifests/init.pp b/modules/shorewall/manifests/init.pp index 120c4a96..bbd4cf93 100644 --- a/modules/shorewall/manifests/init.pp +++ b/modules/shorewall/manifests/init.pp @@ -1,10 +1,8 @@ class shorewall { include concat::setup - $shorewalldir = "/etc/shorewall_test" - 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 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 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 concat::fragment{"newline_${name}": target => $filename, -- cgit v1.2.1