diff options
| author | mh <mh@immerda.ch> | 2011-12-22 21:13:12 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-12-22 21:13:12 +0100 |
| commit | b74e089b30d075e32a7aec7e530ceafefa9e573f (patch) | |
| tree | e985e4365ab58cc26c9c22594bd1865606a83cca /manifests | |
| parent | 052f749adb3b488388cba57f65f74852621ac1fa (diff) | |
| download | puppet-shorewall-b74e089b30d075e32a7aec7e530ceafefa9e573f.tar.gz puppet-shorewall-b74e089b30d075e32a7aec7e530ceafefa9e573f.tar.bz2 | |
add CentOS 6 version
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/base.pp | 11 |
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], |