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 fbb8032c153c70e471a3b3d92f8908bb715f3cdf..0bf0e9dde16ce5083179c61e6fb3ba416d71f047 100644 (file)
--- 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"