summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-11-23 15:48:18 -0500
committerMicah Anderson <micah@riseup.net>2009-11-23 15:48:18 -0500
commitc49625a4cd14a53d91b7d12aea88201a211a26a2 (patch)
treeea167ac9fb110a1464306a6827065ffeff32ec1b
parent33df59d5016a503c21495eedcc4c9e3cabf9e28c (diff)
switch the shorewall.conf source first hits to use the
$fileserver/shorewall location. this enables you to put these files in your local fileserver area, without modifying the shorewall module. if you dont need to do this, then the shorewall module defaults will be used instead
-rw-r--r--manifests/init.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index fbb8032..0bf0e9d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -276,11 +276,11 @@ class shorewall::base {
file { "/etc/shorewall/shorewall.conf":
# use OS specific defaults, but use Default if no other is found
source => [
- "puppet://$server/files/shorewall/${fqdn}/shorewall.conf.$operatingsystem",
- "puppet://$server/files/shorewall/${fqdn}/shorewall.conf",
- "puppet://$server/files/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
- "puppet://$server/files/shorewall/shorewall.conf.$operatingsystem",
- "puppet://$server/files/shorewall/shorewall.conf",
+ "puppet://$fileserver/shorewall/${fqdn}/shorewall.conf.$operatingsystem",
+ "puppet://$fileserver/shorewall/${fqdn}/shorewall.conf",
+ "puppet://$fileserver/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
+ "puppet://$fileserver/shorewall/shorewall.conf.$operatingsystem",
+ "puppet://$fileserver/shorewall/shorewall.conf",
"puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
"puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem",
"puppet://$server/modules/shorewall/shorewall.conf.Default"