From: am <am@d66ca3ae-40d7-4aa7-90d4-87d79ca94279>
Date: Tue, 15 Jul 2008 15:11:27 +0000 (+0000)
Subject: shorewall.conf at dist-location
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=32aefaeff845390fdf7795249b9806623c658f36;p=puppet-shorewall.git

shorewall.conf at dist-location


git-svn-id: https://svn/ipuppet/trunk/modules/shorewall@1844 d66ca3ae-40d7-4aa7-90d4-87d79ca94279
---

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],