From da039271d2a4388cb4a385118719d16bc25e2c7e Mon Sep 17 00:00:00 2001 From: octo Date: Fri, 20 Jan 2006 09:16:19 +0000 Subject: [PATCH] Updated `collectd.spec', though not tested it.. Updated `contrib/init.d-rh7' Applied bugfix to `debian/rules' --- collectd.spec | 49 +++++++++++++++++++++++++++++++++---------------- contrib/init.d-rh7 | 34 ++++------------------------------ debian/rules | 2 ++ 3 files changed, 39 insertions(+), 46 deletions(-) diff --git a/collectd.spec b/collectd.spec index 746f6707..b03991cf 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,12 +1,12 @@ Summary: Statistics collection daemon for filling RRD files. Name: collectd -Version: 3.5.0 +Version: 3.6.0 Release: 1 Source: http://verplant.org/collectd/%{name}-%{version}.tar.gz License: GPL Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: lm_sensors-devel, rrdtool-devel +BuildPrereq: lm_sensors-devel, mysqlclient10-devel | mysql-devel, rrdtool-devel Requires: rrdtool Packager: Florian octo Forster Vendor: Florian octo Forster @@ -18,14 +18,6 @@ Since the daemon doesn't need to startup every time it wants to update the files it's very fast and easy on the system. Also, the statistics are very fine grained since the files are updated every 10 seconds. -%package sensors -Summary: libsensors-module for collectd. -Group: System Environment/Daemons -Requires: collectd = %{version}, lm_sensors -%description sensors -This plugin for collectd provides querying of sensors supported by -lm_sensors. - %package hddtemp Summary: hddtemp-module for collectd. Group: System Environment/Daemons @@ -34,6 +26,22 @@ Requires: collectd = %{version}, hddtemp >= 0.3 This plugin for collectd provides querying the hddtemp-daemon. For more information see hddtemp's homepage: http://www.guzu.net/linux/hddtemp.php +%package mysql +Summary: mysql-module for collectd. +Group: System Environment/Daemons +Requires: collectd = %{version}, mysqlclient10 | mysql +%description mysql +MySQL querying plugin. This plugins provides data of issued commands, +called handlers and database traffic. + +%package sensors +Summary: libsensors-module for collectd. +Group: System Environment/Daemons +Requires: collectd = %{version}, lm_sensors +%description sensors +This plugin for collectd provides querying of sensors supported by +lm_sensors. + %prep rm -rf $RPM_BUILD_ROOT %setup @@ -44,9 +52,8 @@ make %install make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/default -cp debian/collectd.default $RPM_BUILD_ROOT/etc/default/collectd mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d +cp contrib/collectd.conf $RPM_BUILD_ROOT/etc/collectd.conf cp contrib/init.d-rh7 $RPM_BUILD_ROOT/etc/rc.d/init.d/collectd mkdir -p $RPM_BUILD_ROOT/var/lib/collectd rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a @@ -59,12 +66,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README %doc contrib -%config /etc/default/collectd +%config /etc/collectd.conf %attr(0755,root,root) /etc/rc.d/init.d/collectd %attr(0755,root,root) %{_sbindir}/collectd %attr(0444,root,root) %{_mandir}/man1/* +%attr(0444,root,root) %{_mandir}/man5/* %attr(0444,root,root) %{_libdir}/%{name}/cpu.so* %attr(0444,root,root) %{_libdir}/%{name}/cpufreq.so* +%attr(0444,root,root) %{_libdir}/%{name}/df.so* %attr(0444,root,root) %{_libdir}/%{name}/disk.so* %attr(0444,root,root) %{_libdir}/%{name}/load.so* %attr(0444,root,root) %{_libdir}/%{name}/memory.so* @@ -77,13 +86,21 @@ rm -rf $RPM_BUILD_ROOT %attr(0444,root,root) %{_libdir}/%{name}/users.so* %dir /var/lib/collectd -%files sensors -%attr(0444,root,root) %{_libdir}/%{name}/sensors.so* - %files hddtemp %attr(0444,root,root) %{_libdir}/%{name}/hddtemp.so* +%files mysql +%attr(0444,root,root) %{_libdir}/%{name}/mysql.so* + +%files sensors +%attr(0444,root,root) %{_libdir}/%{name}/sensors.so* + %changelog +* Fri Jan 20 2006 Florian octo Forster 3.6.0-1 +- New upstream version +- Added config file, `collectd.conf(5)', `df.so' +- Added package `collectd-mysql', dependency on `mysqlclient10 | mysql' + * Wed Dec 07 2005 Florian octo Forster 3.5.0-1 - New upstream version diff --git a/contrib/init.d-rh7 b/contrib/init.d-rh7 index ec20d685..01b7213b 100755 --- a/contrib/init.d-rh7 +++ b/contrib/init.d-rh7 @@ -6,43 +6,17 @@ RETVAL=0 ARGS="" prog="collectd" +CONFIG=/etc/collectd.conf if [ -r /etc/default/$prog ]; then . /etc/default/$prog fi -if [ -n "$DATA_DIR" ]; then - ARGS="-D $DATA_DIR" -fi - -if [ -n "$PING_HOST" ]; then - for HOST in $PING_HOST - do - ARGS="$ARGS -p $HOST" - done -fi - start () { - if [ "x$START_SERVER" = "xyes" ] - then - echo -n $"Starting $prog (server): " - daemon /usr/sbin/collectd -s $ARGS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog - fi - if [ "x$START_CLIENT" = "xyes" ] - then - echo -n $"Starting $prog (client): " - daemon /usr/sbin/collectd -c $ARGS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog - fi - if [ "x$START_SERVER" != "xyes" -a "x$START_CLIENT" != "xyes" ] + echo -n $"Starting $prog: " + if [ -r "$CONFIG" ] then - echo -n $"Starting $prog: " - daemon /usr/sbin/collectd -l $ARGS + daemon /usr/sbin/collectd -C "$CONFIG" RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog diff --git a/debian/rules b/debian/rules index 938c1db8..c11a195f 100755 --- a/debian/rules +++ b/debian/rules @@ -72,6 +72,8 @@ install: build # Add here commands to install the package into debian/collectd. $(MAKE) DESTDIR=$(CURDIR)/debian/collectd install + mkdir -p $(CURDIR)/debian/collectd/etc + cp contrib/collectd.conf $(CURDIR)/debian/collectd/etc/ rm $(CURDIR)/debian/collectd/usr/lib/collectd/*.a || true rm $(CURDIR)/debian/collectd/usr/lib/collectd/*.la || true -- 2.11.0