Merge branch 'master' of github.com:netmanagers/puppet-fail2ban

fixed the process name for redhat bases distros

Modulefile

@@ -1,5 +1,5 @@
 name    'netmanagers-fail2ban'
-version '1.1.1'
+version '1.2.0'
 author  'Javier Bertoli'
 license 'Apache2'
 project_page 'http://www.netmanagers.com.ar'

manifests/jail.pp

@@ -78,9 +78,12 @@ define fail2ban::jail (
     default   => $action,
   }
 
-  $real_logpath = $logpath ? {
+  $array_logpath = is_array($logpath) ? {
-    ''      => '',
+    false     => $logpath ? {
-    default => $logpath,
+      ''      => [],
+      default => [$logpath],
+    },
+    default   => $logpath,
   }
 
   $real_maxretry = $maxretry ? {

manifests/params.pp

@@ -29,8 +29,9 @@ class fail2ban::params {
   }
 
   $process = $::operatingsystem ? {
-    /(?i:Debian|Ubuntu|Mint)/ => 'fail2ban-server',
+    /(?i:Debian|Ubuntu|Mint)/                           => 'fail2ban-server',
-    default                   => 'fail2ban',
+    /(?i:RedHat|Centos|Scientific|Fedora|OracleLinux)/  => 'fail2ban-server',
+    default                                             => 'fail2ban',
   }
 
   $process_args = $::operatingsystem ? {

spec/defines/fail2ban_jail_spec.rb

@@ -27,7 +27,9 @@ filter   = fail2ban::jail
 "
     end
 
-    it { should contain_concat__fragment('fail2ban_jail_sample1').with_target('/etc/fail2ban/jail.local').with_content(expected) }
+    it 'should create a named jail, enabled and with a filter of the same name' do
+      should contain_concat__fragment('fail2ban_jail_sample1').with_target('/etc/fail2ban/jail.local').with_content(expected)
+    end
   end
 
   describe 'Test jail.local is created with all options' do
@@ -62,6 +64,35 @@ findtime = 9000
 "
     end
 
-    it { should contain_concat__fragment('fail2ban_jail_sample1').with_target('/etc/fail2ban/jail.local').with_content(expected) }
+    it 'should create a customized jail, with own actions parsing a single log file' do
+      should contain_concat__fragment('fail2ban_jail_sample1').with_target('/etc/fail2ban/jail.local').with_content(expected)
+    end
+  end
+  describe 'Test jail.local is created with multiple logpaths' do
+    let(:params) do
+      {
+        :name     => 'title_sample2',
+        :jailname => 'sample2',
+        :port     => '44',
+        :logpath  => [ '/path/to/somelog_1', '/path/to/somelog_2' ],
+        :bantime  => '3003',
+      }
+    end
+    let(:expected) do
+"##################
+[sample2]
+enabled  = true
+filter   = sample2
+port     = 44
+logpath  = /path/to/somelog_1
+	/path/to/somelog_2
+bantime  = 3003
+
+"
+    end
+
+    it 'should create a customized jail, with own actions parsing a single log file' do
+      should contain_concat__fragment('fail2ban_jail_title_sample2').with_target('/etc/fail2ban/jail.local').with_content(expected)
+    end
   end
 end

templates/concat/jail.local-stanza.erb

@@ -10,8 +10,8 @@ port     = <%= @array_port * ',' %>
 <% if @array_action != [] -%>
 action   = <%= @array_action.join("\n\t") %>
 <% end -%>
-<% if @real_logpath != '' -%>
+<% if @array_logpath != [] -%>
-logpath  = <%= @real_logpath %>
+logpath  = <%= @array_logpath.join("\n\t") %>
 <% end -%>
 <% if @real_maxretry != '' -%>
 maxretry = <%= @real_maxretry %>