diff options
| author | mh <mh@immerda.ch> | 2012-06-06 01:19:34 -0300 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-06-06 01:19:34 -0300 |
| commit | 5f5482a2084029382a10058a287ff85c8c16c7ac (patch) | |
| tree | 2e4c6f2fe63e525935133685b6341928ac3f7885 /manifests/base.pp | |
| parent | ce27d7cd097c0e2267be494b9988efe91b87165f (diff) | |
| download | puppet-shorewall-5f5482a2084029382a10058a287ff85c8c16c7ac.tar.gz puppet-shorewall-5f5482a2084029382a10058a287ff85c8c16c7ac.tar.bz2 | |
fix for new style for 2.7
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index d3fdec7..709f4b7 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -8,14 +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", - "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}.${lsbmajdistrelease}", - "puppet:///modules/shorewall/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", + "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], |