update file path to new 0.25 style

diff --git a/manifests/base.pp b/manifests/base.pp
index 69dc50fd74b2183f930cb1ef25dc036e076bfe4b..f0fd583124a638149bca26c9329ae54af75ee9e8 100644 (file)
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -12,9 +12,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"
         ],
         require => Package[shorewall],
         notify => Service[shorewall],

diff --git a/manifests/debian.pp b/manifests/debian.pp
index b25d2d5051116773c625618f9b119356d5c805fc..2583d85e026dc1abc3abf2b6932b14e885314dba 100644 (file)
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -1,6 +1,6 @@
 class shorewall::debian inherits shorewall::base {
     file{'/etc/default/shorewall':
-        source => "puppet://$server/shorewall/debian/default",
+        source => "puppet://$server/modules/shorewall/debian/default",
         require => Package['shorewall'],
         notify => Service['shorewall'],
         owner => root, group => 0, mode => 0644;

diff --git a/manifests/managed_file.pp b/manifests/managed_file.pp
index 6ade6c9114ffb4fa1b8a305b21e8f5e7a6d9e02f..80ffdca57455bd4f4b3211f554bbd96457df2684 100644 (file)
--- a/manifests/managed_file.pp
+++ b/manifests/managed_file.pp
@@ -6,11 +6,11 @@ define shorewall::managed_file () {
     }       
     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}"];
     }