From 8e688e60fd7c79e9702acfdaf2d724d45b7981a8 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Fri, 12 Nov 2010 22:33:33 +0000 Subject: use shorewall for shorewall directory --- modules/shorewall/manifests/init.pp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/shorewall/manifests/init.pp b/modules/shorewall/manifests/init.pp index 7c8e1f55..d2eef0bb 100644 --- a/modules/shorewall/manifests/init.pp +++ b/modules/shorewall/manifests/init.pp @@ -1,8 +1,10 @@ class shorewall { include concat::setup + $shorewalldir = "/tmp/shorewall" + define shorewallfile () { - $filename = "/tmp/shorewall/${name}" + $filename = "${shorewalldir}/${name}" $header = "puppet:///modules/shorewall/headers/${name}" $footer = "puppet:///modules/shorewall/footers/${name}" concat{$filename: @@ -27,7 +29,7 @@ class shorewall { ### Rules shorewallfile{ rules: } define rule_line($order = 50) { - $filename = "/tmp/shorewall/rules" + $filename = "${shorewalldir}/rules" $line = "${name}\n" concat::fragment{"newline_${name}": target => $filename, @@ -54,7 +56,7 @@ class shorewall { ### Zones shorewallfile{ zones: } define zone_line($order = 50) { - $filename = "/tmp/shorewall/zones" + $filename = "${shorewalldir}/zones" $line = "${name}\n" concat::fragment{"newline_${name}": target => $filename, @@ -74,7 +76,7 @@ class shorewall { ### Policy shorewallfile{ policy: } define policy_line($order = 50) { - $filename = "/tmp/shorewall/policy" + $filename = "${shorewalldir}/policy" $line = "${name}\n" concat::fragment{"newline_${name}": target => $filename, -- cgit v1.2.1