projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
novi upstream verzije 2.8.3
[ossec-hids.git]
/
src
/
init
/
ossec-local.sh
diff --git
a/src/init/ossec-local.sh
b/src/init/ossec-local.sh
index
12f5196
..
a1dc89a
100755
(executable)
--- a/
src/init/ossec-local.sh
+++ b/
src/init/ossec-local.sh
@@
-22,7
+22,7
@@
fi
NAME="OSSEC HIDS"
NAME="OSSEC HIDS"
-VERSION="v2.5.1"
+VERSION="v2.8.3"
AUTHOR="Trend Micro Inc."
DAEMONS="ossec-monitord ossec-logcollector ossec-syscheckd ossec-analysisd ossec-maild ossec-execd ${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON}"
AUTHOR="Trend Micro Inc."
DAEMONS="ossec-monitord ossec-logcollector ossec-syscheckd ossec-analysisd ossec-maild ossec-execd ${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON}"
@@
-177,14
+177,17
@@
disable()
# Status function
status()
{
# Status function
status()
{
+ RETVAL=0
for i in ${DAEMONS}; do
pstatus ${i};
if [ $? = 0 ]; then
for i in ${DAEMONS}; do
pstatus ${i};
if [ $? = 0 ]; then
+ RETVAL=1
echo "${i} not running..."
else
echo "${i} is running..."
fi
echo "${i} not running..."
else
echo "${i} is running..."
fi
- done
+ done
+ exit $RETVAL
}
testconfig()
}
testconfig()
@@
-207,9
+210,10
@@
start()
SDAEMONS="${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON} ossec-maild ossec-execd ossec-analysisd ossec-logcollector ossec-syscheckd ossec-monitord"
echo "Starting $NAME $VERSION (by $AUTHOR)..."
SDAEMONS="${DB_DAEMON} ${CSYSLOG_DAEMON} ${AGENTLESS_DAEMON} ossec-maild ossec-execd ossec-analysisd ossec-logcollector 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."
if [ ! $? = 0 ]; then
echo "ossec-analysisd: Configuration error. Exiting."
+ exit 1;
fi
lock;
fi
lock;
@@
-222,6
+226,7
@@
start()
if [ $? = 0 ]; then
${DIR}/bin/${i} ${DEBUG_CLI};
if [ $? != 0 ]; then
if [ $? = 0 ]; then
${DIR}/bin/${i} ${DEBUG_CLI};
if [ $? != 0 ]; then
+ echo "${i} did not start correctly.";
unlock;
exit 1;
fi
unlock;
exit 1;
fi
@@
-237,6
+242,14
@@
start()
# to internally create their PID files.
sleep 2;
unlock;
# to internally create their PID files.
sleep 2;
unlock;
+
+ ls -la "${DIR}/ossec-agent/" >/dev/null 2>&1
+ if [ $? = 0 ]; then
+ echo ""
+ echo "Starting sub agent directory (for hybrid mode)"
+ ${DIR}/ossec-agent/bin/ossec-control start
+ fi
+
echo "Completed."
}
echo "Completed."
}
@@
-291,6
+304,13
@@
stopa()
done
unlock;
done
unlock;
+
+ ls -la "${DIR}/ossec-agent/" >/dev/null 2>&1
+ if [ $? = 0 ]; then
+ echo ""
+ echo "Stopping sub agent directory (for hybrid mode)"
+ ${DIR}/ossec-agent/bin/ossec-control stop
+ fi
echo "$NAME $VERSION Stopped"
}
echo "$NAME $VERSION Stopped"
}
@@
-308,6
+328,7
@@
case "$1" in
restart)
testconfig
stopa
restart)
testconfig
stopa
+ sleep 1;
start
;;
status)
start
;;
status)