# HG changeset patch # User Michael Schloh von Bennewitz # Date 1239014531 -7200 # Node ID d51e263e607b806e70375591b564eaf8a70c02fd # Parent d3e0f51e3821482e2832874719eb789544be9b73 Correct path to perl(1) and integrate mrtg-traffic-sum(1) logic. diff -r d3e0f51e3821 -r d51e263e607b mrtg/mrtg.spec --- a/mrtg/mrtg.spec Sun Apr 05 01:38:50 2009 +0200 +++ b/mrtg/mrtg.spec Mon Apr 06 12:42:11 2009 +0200 @@ -32,7 +32,7 @@ Group: Monitoring License: GPL Version: 2.16.2 -Release: 20090404 +Release: 20090405 # list of sources Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz @@ -65,6 +65,7 @@ %setup -q %{l_shtool} subst \ -e 's;mrtg2";mrtg";g' \ + -e "s;/usr\(/bin/perl\);%{l_prefix}\1;" \ bin/* %build @@ -116,3 +117,8 @@ %clean rm -rf $RPM_BUILD_ROOT +%preun + # remove log files before erasing + [ $1 -eq 0 ] || exit 0 + rm -f $RPM_INSTALL_PREFIX/var/mrtg/.log* >/dev/null 2>&1 || true + diff -r d3e0f51e3821 -r d51e263e607b mrtg/rc.mrtg --- a/mrtg/rc.mrtg Sun Apr 05 01:38:50 2009 +0200 +++ b/mrtg/rc.mrtg Mon Apr 06 12:42:11 2009 +0200 @@ -5,13 +5,38 @@ %config mrtg_enable="$openpkg_rc_def" + mrtg_sumlog="no" + mrtg_summin="10" + mrtg_sumail="" + mrtg_sumpat="<[Hh][1-9]>([Tt]raffic[^<]*)" + +%common + mrtg_etcdir="@l_prefix@/etc/mrtg" + mrtg_vardir="@l_prefix@/var/mrtg" + mrtg_webdir="@l_prefix@/web/mrtg" %quarterly -u @l_susr@ rcService mrtg enable yes || exit 0 export LANG=C @l_prefix@/bin/mrtg \ - --pid-file=@l_prefix@/var/mrtg/mrtg.pid \ - --lock-file=@l_prefix@/var/mrtg/mrtg.lock \ - --confcache-file=@l_prefix@/var/mrtg/mrtg.cache \ - @l_prefix@/etc/mrtg/mrtg.cfg + --pid-file=$mrtg_vardir/mrtg.pid \ + --lock-file=$mrtg_vardir/mrtg.lock \ + --confcache-file=$mrtg_vardir/mrtg.cache \ + $mrtg_etcdir/mrtg.cfg +%monthly -u @l_musr@ + rcService mrtg enable yes || exit 0 + rcVarIsYes mrtg_sumlog || exit 0 + @l_prefix@/bin/mrtg-traffic-sum \ + --min $mrtg_summin \ + --catch $mrtg_sumpat \ + $mrtg_etcdir/mrtg.cfg \ + >>$mrtg_vardir/mrtg.log + if [ ".$mrtg_sumail" != . ]; then + @l_prefix@/bin/mrtg-traffic-sum \ + --min $mrtg_summin \ + --email $mrtg_sumail \ + --catch $mrtg_sumpat \ + $mrtg_etcdir/mrtg.cfg + fi +