aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/base.pp6
-rw-r--r--manifests/debian.pp2
-rw-r--r--manifests/managed_file.pp4
3 files changed, 6 insertions, 6 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index 69dc50f..f0fd583 100644
--- 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 b25d2d5..2583d85 100644
--- 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 6ade6c9..80ffdca 100644
--- 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}"];
}