From b74e089b30d075e32a7aec7e530ceafefa9e573f Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 22 Dec 2011 21:13:12 +0100
Subject: add CentOS 6 version

---
 manifests/base.pp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index c9fa660..d3fdec7 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -8,13 +8,14 @@ class shorewall::base {
       '/etc/shorewall/shorewall.conf':
         # use OS specific defaults, but use Default if no other is found
         source => [
-            "puppet:///modules/site-shorewall/${fqdn}/shorewall.conf.$operatingsystem",
+            "puppet:///modules/site-shorewall/${fqdn}/shorewall.conf.${operatingsystem}",
             "puppet:///modules/site-shorewall/${fqdn}/shorewall.conf",
-            "puppet:///modules/site-shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
-            "puppet:///modules/site-shorewall/shorewall.conf.$operatingsystem",
+            "puppet:///modules/site-shorewall/shorewall.conf.${operatingsystem}.${lsbdistcodename}",
+            "puppet:///modules/site-shorewall/shorewall.conf.${operatingsystem}",
             "puppet:///modules/site-shorewall/shorewall.conf",
-            "puppet:///modules/shorewall/shorewall.conf.$operatingsystem.$lsbdistcodename",
-            "puppet:///modules/shorewall/shorewall.conf.$operatingsystem",
+            "puppet:///modules/shorewall/shorewall.conf.${operatingsystem}.${lsbdistcodename}",
+            "puppet:///modules/shorewall/shorewall.conf.${operatingsystem}.${lsbmajdistrelease}",
+            "puppet:///modules/shorewall/shorewall.conf.${operatingsystem}",
             "puppet:///modules/shorewall/shorewall.conf"
         ],
         require => Package[shorewall],
-- 
cgit v1.2.3