OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Jan-2008 18:23:52
Branch: HEAD Handle: 2008011317235100
Modified files:
openpkg-src/cacti cacti.spec rc.cacti
Log:
Cacti requires higher cron resolution, so switch to dcron
Summary:
Revision Changes Path
1.48 +15 -8 openpkg-src/cacti/cacti.spec
1.3 +0 -7 openpkg-src/cacti/rc.cacti
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cacti/cacti.spec
============================================================================
$ cvs diff -u -r1.47 -r1.48 cacti.spec
--- openpkg-src/cacti/cacti.spec 13 Jan 2008 09:54:36 -0000 1.47
+++ openpkg-src/cacti/cacti.spec 13 Jan 2008 17:23:51 -0000 1.48
@@ -46,7 +46,7 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
PreReq: OpenPKG, openpkg >= 20060823
-PreReq: rrdtool, mysql, snmp, perl, php
+PreReq: rrdtool, mysql, snmp, perl, php, dcron
PreReq: apache
PreReq: apache-php
PreReq: apache-php::with_mysql = yes
@@ -83,6 +83,7 @@
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/sbin \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/dcron/crontabs \
$RPM_BUILD_ROOT%{l_prefix}/etc/cacti \
$RPM_BUILD_ROOT%{l_prefix}/share/cacti \
$RPM_BUILD_ROOT%{l_prefix}/var/cacti/run
@@ -159,10 +160,20 @@
%{SOURCE cacti-apache.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/cacti/
+ # install custom crontab
+ ( echo "##"
+ echo "## Cacti crontab"
+ echo "##"
+ echo ""
+ echo "*/5 * * * * su %{l_rusr} -c %{l_prefix}/sbin/cacti-cron"
+ echo ""
+ ) >$RPM_BUILD_ROOT%{l_prefix}/etc/dcron/crontabs/cacti
+
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/cacti/*' \
+ '%config %{l_prefix}/etc/dcron/crontabs/cacti' \
'%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/cacti'
%files -f files
@@ -179,13 +190,9 @@
echo " \$ $RPM_INSTALL_PREFIX/sbin/cacti-setup"
echo ""
echo "2. By default, Cacti is run by the OpenPKG cron jobs only
every"
- echo " 15 minutes. To run Cacti every 5 minutes for more
granular"
- echo " data gathering, set this variable:"
- echo " # $RPM_INSTALL_PREFIX/etc/rc.conf:"
- echo " cacti_cron=\"no\""
- echo " and insert a new cronjob for user %{l_rusr}"
- echo " # system crontab:"
- echo " */5 * * * * %{l_rusr}
$RPM_INSTALL_PREFIX/sbin/cacti-cron"
+ echo " 5 minutes. To run Cacti every 1 minute for even more
granular"
+ echo " data gathering, edit the following crontab(5) file:"
+ echo " \$ vi $RPM_INSTALL_PREFIX/etc/dcron/crontabs/cacti"
echo ""
echo "3. By default, Cacti runs its own Apache server on IPv4
address"
echo " 127.0.0.1, TCP port 8080. Please change this by editing
the"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cacti/rc.cacti
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.cacti
--- openpkg-src/cacti/rc.cacti 25 Aug 2006 19:16:03 -0000 1.2
+++ openpkg-src/cacti/rc.cacti 13 Jan 2008 17:23:51 -0000 1.3
@@ -5,7 +5,6 @@
%config
cacti_enable="$openpkg_rc_def"
- cacti_cron="yes"
%status -u @l_susr@ -o
cacti_usable="no"
@@ -38,9 +37,3 @@
rcService cacti active no && exit 0
rc cacti stop start
-%quarterly -u @l_rusr@
- rcService cacti enable yes || exit 0
- if [ ".$cacti_cron" = .yes ]; then
- @l_prefix@/sbin/cacti-cron
- fi
-
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
