switch to 0.25 module style source references

diff --git a/manifests/init.pp b/manifests/init.pp
index aa6eb61c1e9e25886a29e69a6c5cf90b1643de43..fbb8032c153c70e471a3b3d92f8908bb715f3cdf 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -69,11 +69,11 @@ class shorewall {
     }
     file {
       "${dir}/000-header":
-       source => "puppet://$server/shorewall/boilerplate/${name}.header",
+       source => "puppet://$server/modules/shorewall/boilerplate/${name}.header",
        mode => 0600, owner => root, group => 0,
        notify => Exec["concat_${dir}"];
       "${dir}/999-footer":
-       source => "puppet://$server/shorewall/boilerplate/${name}.footer",
+       source => "puppet://$server/modules/shorewall/boilerplate/${name}.footer",
        mode => 0600, owner => root, group => 0,
        notify => Exec["concat_${dir}"];
     }
@@ -281,9 +281,9 @@ class shorewall::base {
                "puppet://$server/files/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
                "puppet://$server/files/shorewall/shorewall.conf.$operatingsystem",
                "puppet://$server/files/shorewall/shorewall.conf",
-               "puppet://$server/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
-               "puppet://$server/shorewall/shorewall.conf.$operatingsystem",
-               "puppet://$server/shorewall/shorewall.conf.Default"
+               "puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
+               "puppet://$server/modules/shorewall/shorewall.conf.$operatingsystem",
+               "puppet://$server/modules/shorewall/shorewall.conf.Default"
                ],
     mode => 0644, owner => root, group => 0,
     require => Package[shorewall],