update to 0.25.x style

diff --git a/manifests/base.pp b/manifests/base.pp
index f0fd583124a638149bca26c9329ae54af75ee9e8..0473f749a5677965bf0224df4d4f7cd1972b9e71 100644 (file)
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -7,11 +7,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://$server/modules/site-shorewall/${fqdn}/shorewall.conf.$operatingsystem",
+            "puppet://$server/modules/site-shorewall/${fqdn}/shorewall.conf",
+            "puppet://$server/modules/site-shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
+            "puppet://$server/modules/site-shorewall/shorewall.conf.$operatingsystem",
+            "puppet://$server/modules/site-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"