2007-06-04 Raúl Mateos <rmateos@netscape.net>

* pandora_server, pandora_network, pandora_snmpconsole: Added FMS text.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@485 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2007-06-04 13:45:35 +00:00
parent 5a273a82a3
commit 39866e63e9
4 changed files with 33 additions and 29 deletions

View File

@ -1,21 +1,25 @@
2007-06-04 Raúl Mateos <rmateos@netscape.net>
* pandora_server, pandora_network, pandora_snmpconsole: Added FMS text.
2007-05-24 Sancho Lerena <slerena@artica.es>
* conf/pandora_server.conf: Added support for dbname option.
* conf/pandora_server.conf: Added support for dbname option.
* pandora_snmpconsole: Version and bash header updated.
* pandora_snmpconsole: Version and bash header updated.
* bin/pandora_config.pm: Added support for dbname option. Added
some default options for DB.
* bin/pandora_config.pm: Added support for dbname option. Added
some default options for DB.
* bin/pandora_db.pm: Fixed stupid bug in alert execution. Added
support for dbname option and other minor fixes.
* bin/pandora_db.pm: Fixed stupid bug in alert execution. Added
support for dbname option and other minor fixes.
* bin/pandora_server.pl,
bin/pandora_network.pl,
bin/pandora_snmpconsole.pl,
bin/pandora_recon.pl: Added support for dbname option.
* bin/pandora_server.pl,
bin/pandora_network.pl,
bin/pandora_snmpconsole.pl,
bin/pandora_recon.pl: Added support for dbname option.
* pandora_server: Version update
* pandora_server: Version update
2007-05-21 Sancho Lerena <slerena@artica.es>

View File

@ -13,7 +13,7 @@ PANDORA_NETWORK_PID="$PANDORA_HOME/var/pandora_network.pid"
if [ ! -f $PANDORA_HOME/bin/pandora_network.pl ]
then
echo "Pandora Network Server not found, please check setup and read manual"
echo "Pandora FMS Network Server not found, please check setup and read manual"
exit
fi
@ -22,7 +22,7 @@ case "$1" in
OLD_PATH="`pwd`"
if [ -f $PANDORA_NETWORK_PID ]
then
echo "Pandora Network Server is currently running on this machine. Aborting now..."
echo "Pandora FMS Network Server is currently running on this machine. Aborting now..."
exit
fi
@ -34,14 +34,14 @@ case "$1" in
echo $MYPID > $PANDORA_NETWORK_PID
echo "Pandora Network Server is now running with PID $MYPID"
else
echo "Cannot start Pandora Network Server. Aborted"
echo "Cannot start Pandora FMS Network Server. Aborted"
fi
cd "$OLD_PATH"
;;
stop)
if [ -f $PANDORA_NETWORK_PID ]
then
echo "Stopping Pandora Network Server"
echo "Stopping Pandora FMS Network Server"
PID_2=`cat $PANDORA_NETWORK_PID`
if [ ! -z "`ps -F -p $PID_2 | grep -v grep | grep 'pandora_network'`" ]
then
@ -49,7 +49,7 @@ case "$1" in
fi
rm -f $PANDORA_NETWORK_PID
else
echo "Pandora Network Server is not running, cannot stop it."
echo "Pandora FMS Network Server is not running, cannot stop it."
fi
;;
force-reload|restart)

View File

@ -2,7 +2,7 @@
# Pandora Data Server startup script
# Sancho Lerena, <slerena@gmail.com>
# Linux Version (generic)
# v1.3 (May/2006)
# v1.3 (May/2007)
# Configurable path and filenames
PANDORA_HOME="/usr/share/pandora_server"
@ -12,7 +12,7 @@ PANDORA_SERVER_PID="$PANDORA_HOME/var/pandora_server.pid"
if [ ! -f $PANDORA_HOME/bin/pandora_server.pl ]
then
echo "Pandora Data Server not found, please check setup and read manual"
echo "Pandora FMS Data Server not found, please check setup and read manual"
exit
fi
@ -21,7 +21,7 @@ case "$1" in
OLD_PATH="`pwd`"
if [ -f $PANDORA_SERVER_PID ]
then
echo "Pandora Data Server is currently running on this machine. Aborting now..."
echo "Pandora FMS Data Server is currently running on this machine. Aborting now..."
exit
fi
@ -31,16 +31,16 @@ case "$1" in
if [ ! -z "$MYPID" ]
then
echo $MYPID > $PANDORA_SERVER_PID
echo "Pandora Data Server is now running with PID $MYPID"
echo "Pandora FMS Data Server is now running with PID $MYPID"
else
echo "Cannot start Pandora Data Server. Aborted"
echo "Cannot start Pandora FMS Data Server. Aborted"
fi
cd "$OLD_PATH"
;;
stop)
if [ -f $PANDORA_SERVER_PID ]
then
echo "Stopping Pandora Data Server"
echo "Stopping Pandora FMS Data Server"
PID_2=`cat $PANDORA_SERVER_PID`
if [ ! -z "`ps -F -p $PID_2 | grep -v grep | grep 'pandora_server'`" ]
then
@ -48,7 +48,7 @@ case "$1" in
fi
rm -f $PANDORA_SERVER_PID
else
echo "Pandora Data Server is not running, cannot stop it."
echo "Pandora FMS Data Server is not running, cannot stop it."
fi
;;
force-reload|restart)
@ -56,7 +56,7 @@ case "$1" in
$0 start
;;
*)
echo "Usage: pandora_network {start|stop|restart}"
echo "Usage: pandora_server {start|stop|restart}"
exit 1
esac

View File

@ -2,7 +2,7 @@
# Startup script for Pandora SNMP Console
# Sancho Lerena, <slerena@gmail.com>
# Linux Version(generic)
# v1.3 (May/2006)
# v1.3 (May/2007)
# Compatible with NetSNMP 5.1 or higher
@ -44,7 +44,7 @@ case "$1" in
if [ -f $PANDORA_SNMP_PID ]
then
echo "Pandora SNMP Console is currently running on this machine. Aborting now..."
echo "Pandora FMS SNMP Server is currently running on this machine. Aborting now..."
exit
fi
@ -54,9 +54,9 @@ case "$1" in
if [ ! -z "$MYPID" ]
then
echo $MYPID > $PANDORA_SNMP_PID
echo "Pandora SNMP Console is now running with PID $MYPID"
echo "Pandora FMS SNMP Server is now running with PID $MYPID"
else
echo "Cannot start Pandora Network Server. Aborted"
echo "Cannot start Pandora FMS SNMP Server. Aborted"
fi
cd "$OLD_PATH"
;;
@ -85,7 +85,7 @@ case "$1" in
fi
rm -f $PANDORA_SNMP_PID
else
echo "Pandora SNMP Console is not running, cannot stop it."
echo "Pandora FMS SNMP Console is not running, cannot stop it."
fi
;;
force-reload|restart)