From: Micah Anderson <micah@riseup.net>
Date: Mon, 23 Nov 2009 20:48:18 +0000 (-0500)
Subject: switch the shorewall.conf source first hits to use the
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c49625a4cd14a53d91b7d12aea88201a211a26a2;p=puppet-shorewall.git

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
---

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"