httpscert: Increase size of the RSA key to 4096.

[people/teissler/ipfire-2.x.git] / src / initscripts / init.d / collectd

diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index 5a735ee306072fdcce58aa0927b630038e218406..544b3e1f1472af9c4660a91f16b5db041ac6ae27 100644 (file)
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -13,9 +13,34 @@ fi
 
 case "$1" in
        start)
+               # If run from init and collectd alrady started then exit silent
+               if [ "$(basename $0)" != "collectd" ]; then
+                       if [ "$(ps -A | grep " collectd$")" != "" ]; then
+                               exit 0
+                       fi
+               fi
+
+               # ARM does not support to scan for sensors. In that case,
+               # we create an empty configuration file.
+               machine=$(uname -m)
+               if [ "${machine:0:3}" = "arm" ]; then
+                       touch /etc/sysconfig/lm_sensors
+               fi
+
                # At first run search for sensors with sensors-detect
                if [ ! -e /etc/sysconfig/lm_sensors ]; then
                        boot_mesg "Searching for Sensors..."
+
+                       # pre scan and try to load modules
+                       "yes" | /usr/sbin/sensors-detect > /dev/null
+                       if [ -e /etc/sysconfig/lm_sensors ]; then
+                               # Module load
+                               for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
+                                       modprobe $modul > /dev/null 2>&1;
+                               done
+                       fi
+
+                       # Final scan
                        "yes" | /usr/sbin/sensors-detect > /dev/null
                        evaluate_retval
 
@@ -24,20 +49,24 @@ case "$1" in
                        fi
                fi
 
-               boot_mesg -n "Loading Sensor Modules..."
-               for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
-               modprobe $modul > /dev/null 2>&1;
-                       if [ ${?} = 0 ]; then
-                               boot_mesg -n "$SUCCESS$modul$NORMAL ";
-                       else
-                               boot_mesg -n "$FAILURE$modul$NORMAL ";
-                       fi
-               done
-               boot_mesg;
-               echo_ok;
+               # Load sensor modules only first start
+               if [ ! -e /var/lock/sensors_modules ]; then
+                       touch /var/lock/sensors_modules
+                       boot_mesg -n "Loading Sensor Modules: "
+                       for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
+                       modprobe $modul > /dev/null 2>&1;
+                               if [ ${?} = 0 ]; then
+                                       boot_mesg -n "$SUCCESS$modul$NORMAL ";
+                               else
+                                       boot_mesg -n "$WARNING$modul$NORMAL ";
+                               fi
+                       done
+                       boot_mesg;
+                       echo_ok;
+               fi
 
                # Enable sensors plugin if sensors found
-               if [ $( sensors 2>&1 | grep "No sensors found!" | wc -l ) == "1" ]; then
+               if [ "$( sensors 2>&1 | grep 'No sensors found!' | wc -l )" == "1" ]; then
                        sed -i -e "s|^LoadPlugin sensors|#LoadPlugin sensors|g" /etc/collectd.conf
                else
                        sed -i -e "s|^#LoadPlugin sensors|LoadPlugin sensors|g" /etc/collectd.conf
@@ -45,9 +74,9 @@ case "$1" in
 
                # Enable thermal plugin if thermal_zone found
                if [ ! -e  /sys/class/thermal/thermal_zone0 ]; then
-                       sed -i -e "s|^LoadPlugin thermal|#LoadPlugin thermal|g" /etc/collectd.conf
+                       sed -i -e 's|^include "/etc/collectd.thermal"$|#include "/etc/collectd.thermal"|g' /etc/collectd.conf
                else
-                       sed -i -e "s|^#LoadPlugin thermal|LoadPlugin thermal|g" /etc/collectd.conf
+                       sed -i -e 's|^#include "/etc/collectd.thermal"$|include "/etc/collectd.thermal"|g' /etc/collectd.conf
                fi
 
                # Enable swap plugin if swap found
@@ -57,18 +86,23 @@ case "$1" in
                        sed -i -e "s|^#LoadPlugin swap|LoadPlugin swap|g" /etc/collectd.conf
                fi
 
-               boot_mesg "Starting Collection daemon..."
-               /usr/sbin/collectd -C /etc/collectd.conf
-               evaluate_retval
+               if [ $(date +%Y) -gt 2011 ]; then
+                       boot_mesg "Starting Collection daemon..."
+                       /usr/sbin/collectd -C /etc/collectd.conf
+                       evaluate_retval
+               else
+                       boot_mesg "collectd: cannot start with incorrect time ($(date))."
+                       echo_warning;
+               fi
                ;;
        stop)
+               boot_mesg "Stopping Collection daemon..."
+               killproc /usr/sbin/collectd
+               evaluate_retval
                # Save the ramdisk at manual stop but not at shutdown
                if [ "$(basename $0)" == "collectd" ]; then
                    /etc/init.d/tmpfs backup
                fi
-               boot_mesg "Stopping Collection daemon..."
-               killproc /usr/sbin/collectd
-               evaluate_retval
                ;;
        restart)
                ${0} stop