Mon, 06 Apr 2009 12:42:11 +0200
Correct path to perl(1) and integrate mrtg-traffic-sum(1) logic.
mrtg/mrtg.spec | file | annotate | diff | comparison | revisions | |
mrtg/rc.mrtg | file | annotate | diff | comparison | revisions |
1.1 --- a/mrtg/mrtg.spec Sun Apr 05 01:38:50 2009 +0200 1.2 +++ b/mrtg/mrtg.spec Mon Apr 06 12:42:11 2009 +0200 1.3 @@ -32,7 +32,7 @@ 1.4 Group: Monitoring 1.5 License: GPL 1.6 Version: 2.16.2 1.7 -Release: 20090404 1.8 +Release: 20090405 1.9 1.10 # list of sources 1.11 Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz 1.12 @@ -65,6 +65,7 @@ 1.13 %setup -q 1.14 %{l_shtool} subst \ 1.15 -e 's;mrtg2";mrtg";g' \ 1.16 + -e "s;/usr\(/bin/perl\);%{l_prefix}\1;" \ 1.17 bin/* 1.18 1.19 %build 1.20 @@ -116,3 +117,8 @@ 1.21 %clean 1.22 rm -rf $RPM_BUILD_ROOT 1.23 1.24 +%preun 1.25 + # remove log files before erasing 1.26 + [ $1 -eq 0 ] || exit 0 1.27 + rm -f $RPM_INSTALL_PREFIX/var/mrtg/.log* >/dev/null 2>&1 || true 1.28 +
2.1 --- a/mrtg/rc.mrtg Sun Apr 05 01:38:50 2009 +0200 2.2 +++ b/mrtg/rc.mrtg Mon Apr 06 12:42:11 2009 +0200 2.3 @@ -5,13 +5,38 @@ 2.4 2.5 %config 2.6 mrtg_enable="$openpkg_rc_def" 2.7 + mrtg_sumlog="no" 2.8 + mrtg_summin="10" 2.9 + mrtg_sumail="" 2.10 + mrtg_sumpat="<[Hh][1-9]>([Tt]raffic[^<]*)</[Hh][1-9]>" 2.11 + 2.12 +%common 2.13 + mrtg_etcdir="@l_prefix@/etc/mrtg" 2.14 + mrtg_vardir="@l_prefix@/var/mrtg" 2.15 + mrtg_webdir="@l_prefix@/web/mrtg" 2.16 2.17 %quarterly -u @l_susr@ 2.18 rcService mrtg enable yes || exit 0 2.19 export LANG=C 2.20 @l_prefix@/bin/mrtg \ 2.21 - --pid-file=@l_prefix@/var/mrtg/mrtg.pid \ 2.22 - --lock-file=@l_prefix@/var/mrtg/mrtg.lock \ 2.23 - --confcache-file=@l_prefix@/var/mrtg/mrtg.cache \ 2.24 - @l_prefix@/etc/mrtg/mrtg.cfg 2.25 + --pid-file=$mrtg_vardir/mrtg.pid \ 2.26 + --lock-file=$mrtg_vardir/mrtg.lock \ 2.27 + --confcache-file=$mrtg_vardir/mrtg.cache \ 2.28 + $mrtg_etcdir/mrtg.cfg 2.29 2.30 +%monthly -u @l_musr@ 2.31 + rcService mrtg enable yes || exit 0 2.32 + rcVarIsYes mrtg_sumlog || exit 0 2.33 + @l_prefix@/bin/mrtg-traffic-sum \ 2.34 + --min $mrtg_summin \ 2.35 + --catch $mrtg_sumpat \ 2.36 + $mrtg_etcdir/mrtg.cfg \ 2.37 + >>$mrtg_vardir/mrtg.log 2.38 + if [ ".$mrtg_sumail" != . ]; then 2.39 + @l_prefix@/bin/mrtg-traffic-sum \ 2.40 + --min $mrtg_summin \ 2.41 + --email $mrtg_sumail \ 2.42 + --catch $mrtg_sumpat \ 2.43 + $mrtg_etcdir/mrtg.cfg 2.44 + fi 2.45 +