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

This commit is contained in:
Javier Bértoli
2013-12-23 13:58:50 -03:00
2 changed files with 6 additions and 2 deletions

View File

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

View File

@@ -75,6 +75,7 @@ not c
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_content(nil) }
it { should contain_file('sample3.local').without_template }
end
end