1 |
brianr |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf/90UserParameters_mailIn mezzanine_patched_smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf/90UserParameters_mailIn |
2 |
|
|
--- smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf/90UserParameters_mailIn 2009-02-15 04:59:53.000000000 +0100 |
3 |
|
|
+++ mezzanine_patched_smeserver-zabbix-agent-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf/90UserParameters_mailIn 2009-02-15 04:59:45.000000000 +0100 |
4 |
|
|
@@ -9,6 +9,7 @@ |
5 |
|
|
UserParameter=mail.in.denied.spamhelo,/var/lib/zabbix/bin/mail_in.sh check_spamhelo |
6 |
|
|
UserParameter=mail.in.denied.total,/var/lib/zabbix/bin/mail_in.sh total_denied |
7 |
|
|
UserParameter=mail.in.denied.spam,/var/lib/zabbix/bin/mail_in.sh spam_denied |
8 |
|
|
+UserParameter=mail.in.denied.other,/var/lib/zabbix/bin/mail_in.sh other_denied |
9 |
|
|
UserParameter=mail.in.queued.spam,/var/lib/zabbix/bin/mail_in.sh spam_queued |
10 |
|
|
UserParameter=mail.in.queued,/var/lib/zabbix/bin/mail_in.sh queued |
11 |
|
|
UserParameter=mail.in.total,/var/lib/zabbix/bin/mail_in.sh total |
12 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-agent-0.1/root/var/lib/zabbix/bin/parse_mail_in.pl mezzanine_patched_smeserver-zabbix-agent-0.1/root/var/lib/zabbix/bin/parse_mail_in.pl |
13 |
|
|
--- smeserver-zabbix-agent-0.1/root/var/lib/zabbix/bin/parse_mail_in.pl 2009-02-15 04:59:53.000000000 +0100 |
14 |
|
|
+++ mezzanine_patched_smeserver-zabbix-agent-0.1/root/var/lib/zabbix/bin/parse_mail_in.pl 2009-02-15 04:57:41.000000000 +0100 |
15 |
|
|
@@ -23,7 +23,7 @@ |
16 |
|
|
|
17 |
|
|
# On initialise nos compteurs a 0 |
18 |
|
|
my @denied = qw(dnsbl rhsbl clamav check_earlytalker check_basicheaders check_goodrcptto check_spamhelo); |
19 |
|
|
-my @others = qw(total_denied spam_denied spam_queued queued total); |
20 |
|
|
+my @others = qw(total_denied spam_denied other_denied spam_queued queued total); |
21 |
|
|
my %cnt; |
22 |
|
|
foreach (@denied,@others){ |
23 |
|
|
$cnt{$_} = 0; |