Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Berteaud b81a6d1237 Automatic commit of package [smeserver-zabbix-agent] release [0.4.8-1].
Created by command:

/usr/bin/tito tag
2020-05-29 09:35:00 +02:00
Daniel Berteaud 85fb39af13 Adapt regex to match queued emails when spam filtering is disabled 2020-05-29 09:34:41 +02:00
3 changed files with 8 additions and 4 deletions

View File

@ -1 +1 @@
0.4.7-1 ./
0.4.8-1 ./

View File

@ -87,8 +87,8 @@ while (<STDIN>) {
next;
}
# Queued, not tagged as spam, those are the clean emails
elsif ($line =~ m/queued\s+<.*>\s+No,\s+(score|hits)=/){
# Queued, not tagged as spam (or spam filtering disabled), those are the clean emails
elsif ($line =~ m/queued\s+<.*>(\s+No,\s+(score|hits)=.+)?/){
$cnt{queued}++;
next;
}

View File

@ -1,6 +1,6 @@
Summary: sme server integration of zabbix agent
Name: smeserver-zabbix-agent
Version: 0.4.7
Version: 0.4.8
Release: 1%{?dist}
License: GNU GPL version 2
URL: http://www.zabbix.com/
@ -27,6 +27,10 @@ Zabbix is an entreprise-class open source distributed monitoring
solution
%changelog
* Fri May 29 2020 Daniel Berteaud <daniel@firewall-services.com> 0.4.8-1
- Adapt regex to match queued emails when spam filtering is disabled
(daniel@firewall-services.com)
* Thu Feb 27 2020 Daniel Berteaud <daniel@firewall-services.com> 0.4.7-1
- Rewrite util_send_status_mail to go through the SMTP server (daniel@firewall-
services.com)