aboutsummaryrefslogtreecommitdiff
path: root/manifests/base.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/base.pp')
-rw-r--r--manifests/base.pp11
1 files changed, 6 insertions, 5 deletions
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],