packages: cacti-template-mail_statistics/cacti-template-mail_statistics.spe...

[glen]

Author: glen                         Date: Thu Oct 21 15:49:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- renamed to be more generic: mail_statistics
- increase cache time (but be lower than 5m cacti poll interval)
- match some more lines

---- Files affected:
packages/cacti-template-mail_statistics:
   cacti-template-mail_statistics.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/cacti-template-mail_statistics/cacti-template-mail_statistics.spec
diff -u packages/cacti-template-mail_statistics/cacti-template-mail_statistics.spec:1.2 packages/cacti-template-mail_statistics/cacti-template-mail_statistics.spec:1.3
--- packages/cacti-template-mail_statistics/cacti-template-mail_statistics.spec:1.2	Fri Oct 15 08:18:06 2010
+++ packages/cacti-template-mail_statistics/cacti-template-mail_statistics.spec	Thu Oct 21 17:48:59 2010
@@ -1,15 +1,17 @@
 # $Revision$, $Date$
-%define		template	postfix
+%define		template	mail_statistics
 %include	/usr/lib/rpm/macros.perl
-Summary:	Postifix monitoring with Cacti
+Summary:	Mail logs Graphing with Cacti
 Name:		cacti-template-%{template}
 Version:	0.1
-Release:	0.5
+Release:	0.6
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://forums.cacti.net/download/file.php?id=4091#/postfix_mailserver.tar.gz
 # Source0-md5:	3cd539df3669c72b0679f18cbf74f164
 URL:		http://forums.cacti.net/about6657.html
+Patch0:		cachetime.patch
+Patch1:		more-matches.patch
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.554
 Requires:	cacti
@@ -22,23 +24,25 @@
 %define		snmpdconfdir	/etc/snmp
 %define		_libdir			%{_prefix}/lib
 %define		dbfile			/var/spool/postfix/mailstats.db
-%define		agentscript		%{_libdir}/snmpd-agent-cacti_postfix
+%define		agentscript		%{_libdir}/snmpd-agent-cacti-mail_statistics
 # This is officially registered: http://www.oid-info.com/get/1.3.6.1.4.1.16606
 %define		snmpoid			.1.3.6.1.4.1.16606.2
 
 %description
 Postifix monitoring with Cacti.
 
-%package -n net-snmp-agent-cacti_postfix
-Summary:	SNMPd agent to provide Postfix stats
+%package -n net-snmp-agent-mail_statistics
+Summary:	SNMPd agent to provide mail stats
 Group:		Networking/Daemons
 Requires:	net-snmp
 
-%description -n net-snmp-agent-cacti_postfix
-SNMPd agent to provide Postfix stats for cacti.
+%description -n net-snmp-agent-mail_statistics
+SNMPd agent to provide mail stats for Cacti.
 
 %prep
 %setup -qc
+%patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,13 +59,13 @@
 %post
 %cacti_import_template %{resourcedir}/cacti_host_template_postfix_mailserver.xml
 
-%post -n net-snmp-agent-cacti_postfix
+%post -n net-snmp-agent-mail_statistics
 if ! grep -qF %{snmpoid} %{snmpdconfdir}/snmpd.local.conf; then
 	echo "extend %{snmpoid} cacti_postfix %{agentscript} /var/log/maillog %{dbfile} %{snmpoid}" >> %{snmpdconfdir}/snmpd.local.conf
 	%service -q snmpd reload
 fi
 
-%preun -n net-snmp-agent-cacti_postfix
+%preun -n net-snmp-agent-mail_statistics
 if [ "$1" = 0 ]; then
 	if [ -f %{snmpdconfdir}/snmpd.local.conf ]; then
 		%{__sed} -i -e "/extend %(echo %{snmpoid} | sed -e 's,\.,\\.,g')/d" %{snmpdconfdir}/snmpd.local.conf
@@ -73,7 +77,7 @@
 %defattr(644,root,root,755)
 %{resourcedir}/*.xml
 
-%files -n net-snmp-agent-cacti_postfix
+%files -n net-snmp-agent-mail_statistics
 %defattr(644,root,root,755)
 %attr(755,root,root) %{agentscript}
 %ghost %attr(700,root,root) %{dbfile}
@@ -84,6 +88,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/10/21 15:48:59  glen
+- renamed to be more generic: mail_statistics
+- increase cache time (but be lower than 5m cacti poll interval)
+- match some more lines
+
 Revision 1.2  2010/10/15 06:18:06  glen
 - add dbfile to postfix dir, macor for agent script
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cacti-template-mail_statistics/cacti-template-mail_statistics.spec?r1=1.2&r2=1.3&f=u