packages: collectd/collectd.init, collectd/collectd.spec, collectd/TODO (NE...

[blues]

Author: blues                        Date: Tue Jun  2 15:43:47 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- release 2 - check configuration while restarting

---- Files affected:
packages/collectd:
   collectd.init (1.2 -> 1.3) , collectd.spec (1.70 -> 1.71) , TODO (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/collectd/collectd.init
diff -u packages/collectd/collectd.init:1.2 packages/collectd/collectd.init:1.3
--- packages/collectd/collectd.init:1.2	Mon May 26 21:44:34 2008
+++ packages/collectd/collectd.init	Tue Jun  2 17:43:41 2009
@@ -27,6 +27,10 @@
 	exit 0
 fi
 
+checkconfig() {
+	/usr/sbin/collectd -t || exit 1
+}
+
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/collectd ]; then
@@ -51,6 +55,7 @@
 
 condrestart() {
 	if [ -f /var/lock/subsys/collectd ]; then
+		checkconfig
 		stop
 		start
 	else
@@ -68,6 +73,7 @@
   	stop
 	;;
   restart)
+  	checkconfig
 	stop
 	start
 	;;
@@ -78,6 +84,7 @@
 	condrestart 7
 	;;
   status)
+  	checkconfig
 	status collectd
 	exit $?
 	;;

================================================================
Index: packages/collectd/collectd.spec
diff -u packages/collectd/collectd.spec:1.70 packages/collectd/collectd.spec:1.71
--- packages/collectd/collectd.spec:1.70	Wed May 13 10:06:57 2009
+++ packages/collectd/collectd.spec	Tue Jun  2 17:43:41 2009
@@ -1,19 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - package contrib scripts as %doc
-# - perl modules with Collectd classes package to separate package
-# - Disabled modules:
-#    apple_sensors . . . no		(obvious)
-#    ipvs  . . . . . . . no		(ip_vs.h not found - llh to be fixed)
-#    libvirt . . . . . . no		(requires library)
-#    multimeter  . . . . no		?
-#    onewire . . . . . . no		(needs libowfs)
-#    perl  . . . . . . . no		(buggy perl: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072)
-#    rrdcached . . . . . no		(requires rrdtool >= 1.4.0)
-#    tape  . . . . . . . no		?
-# - logrotate file for logfile plugin
-# - %desc -l pl for plugins
-#
 # Conditional build:
 %bcond_without	curl		# apache, ascent, bind, curl and nginx plugins
 %bcond_without	dns		# DNS plugin
@@ -42,7 +27,7 @@
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
 Version:	4.7.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.bz2
@@ -1542,6 +1527,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2009/06/02 15:43:41  blues
+- release 2 - check configuration while restarting
+
 Revision 1.70  2009/05/13 08:06:57  dzeus
 - up to 4.7.0
 - added plugins: conntrack, fscache, protocols, table, ted, uptime

================================================================
Index: packages/collectd/TODO
diff -u /dev/null packages/collectd/TODO:1.1
--- /dev/null	Tue Jun  2 17:43:47 2009
+++ packages/collectd/TODO	Tue Jun  2 17:43:41 2009
@@ -0,0 +1,15 @@
+# TODO:
+- package contrib scripts as %doc
+- perl modules with Collectd classes package to separate package
+- Disabled modules:
+   apple_sensors . . . no             (obvious)
+   ipvs  . . . . . . . no             (ip_vs.h not found - llh to be fixed)
+   libvirt . . . . . . no             (requires library)
+   multimeter  . . . . no             ?
+   onewire . . . . . . no             (needs libowfs)
+   perl  . . . . . . . no             (buggy perl: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=467072)
+   rrdcached . . . . . no             (requires rrdtool >= 1.4.0)
+   tape  . . . . . . . no             ?
+- logrotate file for logfile plugin
+- %desc -l pl for plugins
+- package SpamAssassin plugin from contrib
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/collectd/collectd.init?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/collectd/collectd.spec?r1=1.70&r2=1.71&f=u