aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authoram <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>2008-07-15 15:11:27 +0000
committeram <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>2008-07-15 15:11:27 +0000
commit32aefaeff845390fdf7795249b9806623c658f36 (patch)
treeeb7e352c97db463d3950ae82fd2b9f597be2fb2e /manifests
parent948f7799c8f39708c3c6cceed3d495711c76faa2 (diff)
downloadpuppet-shorewall-32aefaeff845390fdf7795249b9806623c658f36.tar.gz
puppet-shorewall-32aefaeff845390fdf7795249b9806623c658f36.tar.bz2
shorewall.conf at dist-location
git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1844 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp13
1 files changed, 9 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 3c50369..b182c0b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -213,10 +213,15 @@ class shorewall::base {
file { "/etc/shorewall/shorewall.conf":
# use OS specific defaults, but use Default if no other is found
source => [
- "puppet://$server/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
- "puppet://$server/shorewall/shorewall.conf.$operatingsystem",
- "puppet://$server/shorewall/shorewall.conf.Default"
- ],
+ "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/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
+ "puppet://$server/shorewall/shorewall.conf.$operatingsystem",
+ "puppet://$server/shorewall/shorewall.conf.Default"
+ ],
mode => 0644, owner => root, group => 0,
require => Package[shorewall],
notify => Service[shorewall],