Imported Upstream version 2.7

[ossec-hids.git] / src / init / ossec-server.sh

diff --git a/src/init/ossec-server.sh b/src/init/ossec-server.sh
index c7f34f9..d07993b 100755 (executable)
--- a/src/init/ossec-server.sh
+++ b/src/init/ossec-server.sh
@@ -22,7 +22,7 @@ fi
 
 
 NAME="OSSEC HIDS"
-VERSION="v2.5.1"
+VERSION="v2.7"
 AUTHOR="Trend Micro Inc."
 DAEMONS="ossec-monitord ossec-logcollector ossec-remoted ossec-syscheckd ossec-analysisd ossec-maild ossec-execd ${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON}"
 
@@ -177,14 +177,17 @@ disable()
 # Status function
 status()
 {
+    RETVAL=0
     for i in ${DAEMONS}; do
         pstatus ${i};
         if [ $? = 0 ]; then
             echo "${i} not running..."
+            RETVAL=1
         else
             echo "${i} is running..."
         fi
-    done             
+    done
+    exit $RETVAL
 }
 
 testconfig()
@@ -206,9 +209,10 @@ start()
     SDAEMONS="${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON} ossec-maild ossec-execd ossec-analysisd ossec-logcollector ossec-remoted ossec-syscheckd ossec-monitord"
     
     echo "Starting $NAME $VERSION (by $AUTHOR)..."
-    ${DIR}/bin/ossec-logtest -t
+    echo | ${DIR}/bin/ossec-logtest > /dev/null 2>&1;
     if [ ! $? = 0 ]; then
-        echo "ossec-analysisd: Configuration error. Exiting."
+        echo "OSSEC analysisd: Testing rules failed. Configuration error. Exiting."
+        exit 1;
     fi    
     lock;
     checkpid;
@@ -306,8 +310,14 @@ case "$1" in
   restart)
     testconfig
        stopa
+        sleep 1;
        start
        ;;
+  reload)
+        DAEMONS="ossec-monitord ossec-logcollector ossec-remoted ossec-syscheckd ossec-analysisd ossec-maild ${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON}"
+       stopa
+       start
+        ;;
   status)
     status
        ;;