Modified: puppet/modules/shorewall/manifests/init.pp =================================================================== --- puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:49:14 UTC (rev 247) +++ puppet/modules/shorewall/manifests/init.pp 2010-11-12 20:54:59 UTC (rev 248) @@ -29,7 +29,7 @@ ### Rules shorewallfile{ rules: } define rule_line($order = 50) { - $filename = "${shorewalldir}/shorewall/rules" + $filename = "${shorewalldir}/rules" $line = $name concat::fragment{"newline_${name}": target => $filename, @@ -56,7 +56,7 @@ ### Zones shorewallfile{ zones: } define zone_line($order = 50) { - $filename = "${shorewalldir}/shorewall/zones" + $filename = "${shorewalldir}/zones" $line = $name concat::fragment{"newline_${name}": target => $filename, @@ -76,7 +76,7 @@ ### Policy shorewallfile{ policy: } define policy_line($order = 50) { - $filename = "${shorewalldir}/shorewall/policy" + $filename = "${shorewalldir}/policy" $line = $name concat::fragment{"newline_${name}": target => $filename,