- release 2 - check configuration while restarting

Changed files:
    TODO -> 1.1
    collectd.init -> 1.3
    collectd.spec -> 1.71

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..9c9ac7b
--- /dev/null
+++ b/TODO
@@ -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

diff --git a/collectd.init b/collectd.init
index bce6a5f79bf830b349b9188bb19abe9adc316659..7043090ee24692b00e2cff5c596f9c590662e2e1 100644 (file)
--- a/collectd.init
+++ b/collectd.init
@@ -27,6 +27,10 @@ else
        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 @@ stop() {
 
 condrestart() {
        if [ -f /var/lock/subsys/collectd ]; then
+               checkconfig
                stop
                start
        else
@@ -68,6 +73,7 @@ case "$1" in
        stop
        ;;
   restart)
+       checkconfig
        stop
        start
        ;;
@@ -78,6 +84,7 @@ case "$1" in
        condrestart 7
        ;;
   status)
+       checkconfig
        status collectd
        exit $?
        ;;

diff --git a/collectd.spec b/collectd.spec
index 875ac16610c975d69f67bbedff726870ae260e77..5df2bf3c29e6ef0ad54401adde41f2565a0c3543 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,18 +1,3 @@
-# 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
@@ -41,7 +26,7 @@ Summary:      Collects system information in RRD files
 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