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 3c50369d5407b0a75f3d782aadaec2dd6601e2a2..b182c0b8add1824d780fafc15b216f31a4de5d70 100644 (file)
--- 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],