From 823e97f1be0a2c6cd8ce8d29f2ec795ae91875dd Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 16 Apr 2013 12:20:08 +0200
Subject: [PATCH] rename mail_in.sh and mail_out.sh

---
 root/etc/e-smith/templates/etc/crontab/zabbix_mail_stats    | 6 +++---
 root/var/lib/zabbix/bin/{mail_in.sh => util_count_mail_in}  | 0
 .../var/lib/zabbix/bin/{mail_out.sh => util_count_mail_out} | 0
 .../lib/zabbix/bin/{mailstatus.pl => util_send_status_mail} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename root/var/lib/zabbix/bin/{mail_in.sh => util_count_mail_in} (100%)
 rename root/var/lib/zabbix/bin/{mail_out.sh => util_count_mail_out} (100%)
 rename root/var/lib/zabbix/bin/{mailstatus.pl => util_send_status_mail} (100%)

diff --git a/root/etc/e-smith/templates/etc/crontab/zabbix_mail_stats b/root/etc/e-smith/templates/etc/crontab/zabbix_mail_stats
index b4ea242..6d05ae6 100644
--- a/root/etc/e-smith/templates/etc/crontab/zabbix_mail_stats
+++ b/root/etc/e-smith/templates/etc/crontab/zabbix_mail_stats
@@ -3,8 +3,8 @@ if ((${'zabbix-agent'}{'status'} || 'disabled') eq 'enabled'){
     $OUT .=<<"HERE";
 
 # Parse mail logs and write stats in zabbix tmp directory
-*/10    *       *       *       *     root    /var/lib/zabbix/bin/mail_in.sh
-*/10    *       *       *       *     root    /var/lib/zabbix/bin/mail_out.sh
+*/10    *       *       *       *     root    /var/lib/zabbix/bin/util_count_mail_in
+*/10    *       *       *       *     root    /var/lib/zabbix/bin/util_count_mail_out
 
 HERE
 
@@ -12,7 +12,7 @@ HERE
         $OUT .=<<"HERE";
 
 # Send a status mail
-*/15    *       *       *       *     root    /var/lib/zabbix/bin/mailstatus.pl
+*/15    *       *       *       *     root    /var/lib/zabbix/bin/util_send_status_mail
 
 HERE
     }
diff --git a/root/var/lib/zabbix/bin/mail_in.sh b/root/var/lib/zabbix/bin/util_count_mail_in
similarity index 100%
rename from root/var/lib/zabbix/bin/mail_in.sh
rename to root/var/lib/zabbix/bin/util_count_mail_in
diff --git a/root/var/lib/zabbix/bin/mail_out.sh b/root/var/lib/zabbix/bin/util_count_mail_out
similarity index 100%
rename from root/var/lib/zabbix/bin/mail_out.sh
rename to root/var/lib/zabbix/bin/util_count_mail_out
diff --git a/root/var/lib/zabbix/bin/mailstatus.pl b/root/var/lib/zabbix/bin/util_send_status_mail
similarity index 100%
rename from root/var/lib/zabbix/bin/mailstatus.pl
rename to root/var/lib/zabbix/bin/util_send_status_mail