dinislage/puppet-fail2ban
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-filter-source' of https://github.com/AddOnline/puppet-fail2ban into AddOnline-fix-filter-source

Browse Source
This commit is contained in:
Javier Bértoli
2013-12-23 13:58:50 -03:00
parent ceff3a4ed5 1f2c9a8e8e
commit 344ed1dbbb
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/filter.pp
View File

@@ -92,7 +92,10 @@ define fail2ban::filter (
$manage_file_content = $filtertemplate ? { $manage_file_content = $filtertemplate ? {
'' => undef, '' => undef,
default => template($filtertemplate), default => $filtersource ? {
'' => template($filtertemplate),
default => undef,
}
} }
file { "${real_filtername}.local": file { "${real_filtername}.local":

3
spec/defines/fail2ban_filter_spec.rb
View File

@@ -61,7 +61,7 @@ b = 2
not c not c
" "
end end
it { should contain_file('sample2.local').with_path('/etc/fail2ban/filter.d/sample2.local').with_content(expected) } it { should contain_file('sample2.local').with_path('/etc/fail2ban/filter.d/sample2.local').with_content(expected) }
it { should contain_file('sample2.local').without_source } it { should contain_file('sample2.local').without_source }
end end
@@ -75,6 +75,7 @@ not c
end end
it { should contain_file('sample3.local').with_path('/etc/fail2ban/filter.d/sample3.local').with_source('puppet:///some/path/to/source') } it { should contain_file('sample3.local').with_path('/etc/fail2ban/filter.d/sample3.local').with_source('puppet:///some/path/to/source') }
it { should contain_file('sample3.local').with_content(nil) }
it { should contain_file('sample3.local').without_template } it { should contain_file('sample3.local').without_template }
end end
end end