* Fri Jun 09 2017 Stephane de Labrusse <stephdl@de-labrusse.fr> 0.1.1…

…4-1.ns7 - Test if the dovecot log exists before to start the dovecot/sieve jails
stephdl · Jun 9, 2017 · 5d9746a · 5d9746a
1 parent 4f1be6b
commit 5d9746a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/nethserver-fail2ban.spec b/nethserver-fail2ban.spec
@@ -1,6 +1,6 @@
 Summary: NethServer configuration for crontab
 %define name nethserver-fail2ban
-%define version 0.1.13
+%define version 0.1.14
 %define release 1
 Name: %{name}
 Version: %{version}
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_nseventsdir}/%{name}-update
 
 %changelog
+* Fri Jun 09 2017 Stephane de Labrusse <stephdl@de-labrusse.fr> 0.1.14-1.ns7
+- Test if the dovecot log exists before to start the dovecot/sieve jails
+
 * Wed May 03 2017 Stephane de Labrusse <stephdl@de-labrusse.fr> 0.1.13-1-ns7
 - postfix-ddos jail updated
 

diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.local/10dovecot b/root/etc/e-smith/templates/etc/fail2ban/jail.local/10dovecot
@@ -1,6 +1,6 @@
 {
 my $dovecot = $dovecot{status} || 'disabled';
-return "\n#dovecot not used on this server" unless ($dovecot eq 'enabled');
+return "\n#dovecot not used on this server" unless (($dovecot eq 'enabled') && (-f '/var/log/imap'));
 
 my $Dovecot_status = $fail2ban{Dovecot_status} || 'true';
 my $TCPPorts = $dovecot{TCPPorts} || '110,143,4190,993,995';

diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.local/10sieve b/root/etc/e-smith/templates/etc/fail2ban/jail.local/10sieve
@@ -1,6 +1,6 @@
 {
 my $sieve = $dovecot{status} || 'disabled';
-return "\#sieve not used on this server" unless ($sieve eq 'enabled');
+return "\n#sieve not used on this server" unless (($dovecot eq 'enabled') && (-f '/var/log/imap'));
 
 my $Sieve_status = $fail2ban{Sieve_status} || 'true';
 my $TCPPorts = $postfix{TCPPorts} || '25,465,587';