From df0999d8267722694e7993febd1087616d72bc70 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Wed, 16 Dec 2009 18:15:25 +0000 Subject: [PATCH] 2009-12-16 Raul Mateos * DEBIAN/make_deb_package.sh, lib/PandoraFMS/Config.pm, README, pandora_server_upgrade, pandora_server_installer: Preparing release changing version to final. Clean code. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2208 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 +++ pandora_server/DEBIAN/make_deb_package.sh | 4 +- pandora_server/README | 4 +- pandora_server/lib/PandoraFMS/Config.pm | 4 +- pandora_server/pandora_server_installer | 62 +++++++++++------------ pandora_server/pandora_server_upgrade | 31 +++++++----- 6 files changed, 60 insertions(+), 51 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index f409c3ee7e..813ef23c83 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2009-12-16 Raul Mateos + + * DEBIAN/make_deb_package.sh, lib/PandoraFMS/Config.pm, README, + pandora_server_upgrade, pandora_server_installer: Preparing release + changing version to final. Clean code. + 2009-12-14 Raul Mateos * util/pandora_db.pl: Improved help. diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 81ec3ec1d7..a9d4bf360d 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_console_version="3.0.0.RC3" +pandora_console_version="3.0.0." echo "This script to make deb must run as root (because the dh-make-perl need this). Then test if you are root." if [ `id -u` != 0 ] @@ -102,7 +102,7 @@ do #delete "temp_package" in the path final_path=${item#temp_package} - echo $md5" "$final_path >> temp_package/DEBIAN/md5sums + echo $md5" "$final_path >> temp_package/DEBIAN/md5sums fi fi done diff --git a/pandora_server/README b/pandora_server/README index 3bb65db7d4..01dce4589a 100644 --- a/pandora_server/README +++ b/pandora_server/README @@ -1,4 +1,4 @@ -Pandora FMS: The Flexible Monitoring System v2.0 +Pandora FMS: The Flexible Monitoring System v3.0 ================================================= http://www.pandorafms.org @@ -54,4 +54,4 @@ License ------- The project is distributed under the GPL License v2 or later. -Copyright (C) 2004-2008 Pandora FMS development team +Copyright (C) 2004-2009 Pandora FMS development team diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index 3bf3773c91..ab4bf5bf6e 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -36,8 +36,8 @@ our @EXPORT = qw( ); # version: Defines actual version of Pandora Server for this module only -my $pandora_version = "3.0RC3"; -my $pandora_build = "PS091205"; +my $pandora_version = "3.0"; +my $pandora_build = "091216"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 215c27db37..8edae05bd3 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -50,11 +50,11 @@ get_distro () { OS_VERSION=`uname -r` LINUX=NO elif [ `uname -s` == "AIX" ] - then - # For future reference, AIX doesn't have /etc/init.d - LINUX_DISTRO="AIX" - OS_VERSION=`uname -r` - LINUX=NO + then + # For future reference, AIX doesn't have /etc/init.d + LINUX_DISTRO="AIX" + OS_VERSION=`uname -r` + LINUX=NO elif [ `uname -s` == "SunOS" ] then # Some Solaris and other Unices don't have /etc/init.d, some have /usr/spool instead of /var/spool @@ -78,7 +78,7 @@ get_distro () { install () { - perl Makefile.PL > output 2>&1 #&& sleep 2 && cat output | grep "found" | wc -l + perl Makefile.PL > output 2>&1 #&& sleep 2 && cat output | grep "found" | wc -l DEPENDENCIAS=`cat output | grep "found" | wc -l` if [ $DEPENDENCIAS -gt 0 ] then @@ -94,11 +94,11 @@ install () { echo " " echo " $ yum perl-XML-SAX* perl-Tie* perl-XML-Simple* perl-IO-Socket* perl-Time-modules* perl-NetAddr-IP* perl-DateTime* perl-ExtUtils perl-DBI" echo " " - echo " You also will need to install xprobe2 and wmiclient from rpm (download from our website)" + echo " You also will need to install xprobe2 and wmiclient from rpm (download from our website)" echo " " echo "To get it from source through CPAN do" echo " " - echo " $ cpan Digest::MD5 Time::Local DBI XML::Simple IO::Socket Time::HiRes Time::Format NetAddr::IP Mail::Sendmail Net::Traceroute::PurePerl HTML::Entities" + echo " $ cpan Digest::MD5 Time::Local DBI XML::Simple IO::Socket Time::HiRes Time::Format NetAddr::IP Mail::Sendmail Net::Traceroute::PurePerl HTML::Entities" echo " " rm output else @@ -158,7 +158,7 @@ install () { then chown -R pandora:www $PANDORA_SPOOL else - id -g apache > /dev/null + id -g apache > /dev/null if [ $? -eq 0 ] then chown -R pandora:apache $PANDORA_SPOOL @@ -264,7 +264,7 @@ install () { chmod +x /etc/cron.daily/pandora_db else echo "You're probably not using cron for automatic scheduling. You should schedule the following command to run frequently (daily) on your master server:" - echo " perl /usr/share/pandora_server/util/pandora_db.pl /etc/pandora/pandora_server.conf" + echo " perl /usr/share/pandora_server/util/pandora_db.pl /etc/pandora/pandora_server.conf" fi echo echo "Now you have to edit your /etc/pandora/pandora_server.conf file to change the database password (default is pandora) with the one set in include/config.php of your Pandora FMS Console." @@ -290,17 +290,17 @@ uninstall () { rm -Rf $PANDORA_SPOOL/data_in/ echo "If the user Pandora is not being used for any other operations, please delete using the following commands:" - echo " userdel pandora" - echo " rm -Rf /home/pandora/" + echo " userdel pandora" + echo " rm -Rf /home/pandora/" - ## Just to clarify here. Some people (like me) are using the pandora user - ## for other purposes and/or using an LDAP-based user management + ## Just to clarify here. Some people (like me) are using the pandora user + ## for other purposes and/or using an LDAP-based user management ## I would hate to have a script clear out this users' information without any notification - rm -Rf $PANDORA_LOG 2> /dev/null - rm -Rf $PANDORA_CFG_FILE 2> /dev/null - rm -Rf $PANDORA_SERVER 2> /dev/null - rm -Rf /usr/local/bin/pandora_server 2> /dev/null + rm -Rf $PANDORA_LOG 2> /dev/null + rm -Rf $PANDORA_CFG_FILE 2> /dev/null + rm -Rf $PANDORA_SERVER 2> /dev/null + rm -Rf /usr/local/bin/pandora_server 2> /dev/null rm -Rf /usr/bin/pandora_server 2> /dev/null rm -Rf $PANDORA_HOME rm -Rf /etc/cron.daily/pandora_db @@ -310,18 +310,18 @@ uninstall () { update-rc.d -f pandora_server remove update-rc.d -f tentacle_serverd remove fi - rm -Rf /etc/rc2.d/S90pandora_server 2> /dev/null - rm -Rf /etc/rc.d/rc3.d/S90pandora_server 2> /dev/null + rm -Rf /etc/rc2.d/S90pandora_server 2> /dev/null + rm -Rf /etc/rc.d/rc3.d/S90pandora_server 2> /dev/null echo "Done" } help () { - echo " --install To install Pandora FMS Servers on this system (You have to be root)" - echo " --uninstall To uninstall and remove Pandora FMS Servers on this System" + echo " --install To install Pandora FMS Servers on this system (You have to be root)" + echo " --uninstall To uninstall and remove Pandora FMS Servers on this System" echo " " echo " Additional parameters (after --install) " - echo " " - echo " --no-tentacle Skip tentacle server installation (by default tentacle server installed)" + echo " " + echo " --no-tentacle Skip tentacle server installation (by default tentacle server installed)" echo " " } @@ -334,16 +334,16 @@ echo " " case "$MODE" in '--install') - install - exit - ;; + install + exit + ;; '--uninstall') - uninstall - exit - ;; + uninstall + exit + ;; *) - help + help esac diff --git a/pandora_server/pandora_server_upgrade b/pandora_server/pandora_server_upgrade index 31d14df81e..643586b7d4 100644 --- a/pandora_server/pandora_server_upgrade +++ b/pandora_server/pandora_server_upgrade @@ -1,10 +1,13 @@ -# Pandora FMS 3.0 Server Installer (c) 2009 Artica ST -# Please see http://www.pandorafms.com +#!/bin/bash + +# Pandora FMS Server Upgrader (c) 2008-2009 Artica ST +# Linux Version (generic), for SuSe and Debian/Ubuntu only +# other Linux distros could not work properly without modifications +# Please see http://www.pandorafms.org +# v3.0.1 Build 091216 # This code is licensed under GPL 2.0 license. # ********************************************************************** -#!/bin/bash - MODE=$1 install () { @@ -46,11 +49,11 @@ install () { cp util/pandora_server /etc/init.d cp util/tentacle_serverd /etc/init.d - if [ ! -e /etc/cron.daily/pandora_purge_db ] + if [ ! -e /etc/cron.daily/pandora_purge_db ] then echo "You don't have a /etc/cron.daily/pandora_purge_db file, you should consider" echo "to setup the Pandora FMS daily Database Maintance script: " - echo " perl /usr/share/pandora_server/util/pandora_db.pl /etc/pandora/pandora_server.conf" + echo " perl /usr/share/pandora_server/util/pandora_db.pl /etc/pandora/pandora_server.conf" fi echo " " @@ -59,24 +62,24 @@ install () { } help () { - echo " --upgrade To upgrade Pandora FMS Servers on this system (You have to be root)" - echo " " + echo " --upgrade To upgrade Pandora FMS Servers on this system (You have to be root)" + echo " " } # Script banner at start echo " " -echo "Pandora FMS 2.0 Server Upgrade (c) 2009 Artica ST" -echo "This program is licensed under GPL2 Terms. http://pandorafms.com" +echo "Pandora FMS 3.0 Server Upgrade (c) 2009 Artica ST" +echo "This program is licensed under GPL2 Terms. http://pandorafms.org" echo " " case "$MODE" in '--upgrade') - install - exit - ;; + install + exit + ;; *) - help + help esac