Modified: puppet/modules/shorewall/manifests/init.pp =================================================================== --- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:54:59 UTC (rev 248) +++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:57:58 UTC (rev 249) @@ -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 @@ ### 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 @@ ### 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 @@ ### Policy shorewallfile{ policy: } define policy_line($order = 50) { - $filename = "${shorewalldir}/policy" + $filename = "/tmp/shorewall/policy" $line = $name concat::fragment{"newline_${name}": target => $filename,