diff options
| author | intrigeri <intrigeri@boum.org> | 2010-10-17 04:45:09 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-10-17 04:45:09 +0200 |
| commit | f79bf97ec82e8adcf002ca6834b0df66f28e61f2 (patch) | |
| tree | 3b8258b0736051e1c641a58c06b96d716e0d4889 /manifests/base.pp | |
| parent | f9c1086afb6c343fe65e989413acb80cb7d5cb86 (diff) | |
| parent | c49625a4cd14a53d91b7d12aea88201a211a26a2 (diff) | |
| download | puppet-shorewall-f79bf97ec82e8adcf002ca6834b0df66f28e61f2.tar.gz puppet-shorewall-f79bf97ec82e8adcf002ca6834b0df66f28e61f2.tar.bz2 | |
Merge remote branch 'riseup/master'
Conflicts:
files/debian/default
manifests/init.pp
templates/debian/default
templates/debian_default.erb
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index e068c35..58b753e 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -1,6 +1,6 @@ class shorewall::base { package { 'shorewall': - ensure => present, + ensure => $shorewall_ensure_version, } # This file has to be managed in place, so shorewall can find it @@ -38,7 +38,10 @@ class shorewall::base { File["/var/lib/puppet/modules/shorewall/blacklist"], File["/var/lib/puppet/modules/shorewall/rfc1918"], File["/var/lib/puppet/modules/shorewall/routestopped"], - File["/var/lib/puppet/modules/shorewall/params"] + File["/var/lib/puppet/modules/shorewall/params"], + File["/var/lib/puppet/modules/shorewall/tcdevices"], + File["/var/lib/puppet/modules/shorewall/tcrules"], + File["/var/lib/puppet/modules/shorewall/tcclasses"], ], require => Package[shorewall], } |