diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4317abcd07..1e9c74d341 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2010-06-06 Raúl Mateos + + * pandora_console_install: Cleaned code. Updated year. + 2010-06-06 Raúl Mateos * godmode/reporting/reporting_builder.php, godmode/reporting/graphs.php, @@ -22,8 +26,8 @@ 2010-06-03 Miguel de Dios - * general/license/pandora_info_ast_es.html: cleaned html and fixed unclose - html tags in source code, the eclipse warm to me. + * general/license/pandora_info_ast_es.html: cleaned html and fixed unclose + html tags in source code, the eclipse warned me. 2010-06-03 Miguel de Dios @@ -39,7 +43,7 @@ * general/header.php, godmode/db/db_audit.php, godmode/reporting/reporting_builder.item_editor.php: cleaned html and fixed - unclose html tags in source code, the eclipse warm to me. + unclose html tags in source code, the eclipse warned me. 2010-06-02 Raúl Mateos diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install index d1e40ad651..2885f20a0d 100755 --- a/pandora_console/pandora_console_install +++ b/pandora_console/pandora_console_install @@ -1,6 +1,6 @@ #!/bin/bash -# Pandora FMS Console Installer (c) 2008-2009 Artica ST +# Pandora FMS Console Installer (c) 2008-2010 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 @@ -8,7 +8,7 @@ # This code is licensed under GPL 2.0 license. # ********************************************************************** -PI_VERSION=3.0.0 +PI_VERSION=3.1.0 FORCE=0 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"` MODE=$1 @@ -50,10 +50,10 @@ get_distro () { } uninstall () { - echo "Removing Pandora FMS Console" - rm -Rf $PANDORA_HOME + echo "Removing Pandora FMS Console" + rm -Rf $PANDORA_HOME echo "You need to manually drop pandora database from your Database server" - echo "Done" + echo "Done" } install () { @@ -72,23 +72,23 @@ install () { echo "Detecting Linux distribution: $DISTRO" - if [ -f $PANDORA_HOME ] && [ "$FORCE" = "0" ] - then - echo "Seems that default dir already exists. Please use --force to" - echo "force installer to install on $PANDORA_HOME" - exit - else - echo "Checking default dir $PANDORA_HOME..." - fi + if [ -f $PANDORA_HOME ] && [ "$FORCE" = "0" ] + then + echo "Seems that default dir already exists. Please use --force to" + echo "force installer to install on $PANDORA_HOME" + exit + else + echo "Checking default dir $PANDORA_HOME..." + fi - # Create directories - echo "Creating Pandora FMS Console home directory at $PANDORA_HOME ..." - mkdir $PANDORA_HOME 2> /dev/null + # Create directories + echo "Creating Pandora FMS Console home directory at $PANDORA_HOME ..." + mkdir $PANDORA_HOME 2> /dev/null - # Copying Pandora FMS console - echo "Copying Pandora FMS Console to $PANDORA_HOME.." - cp -R * $PANDORA_HOME - chmod -R u+rwX,g+rX,g-w,o-rwx $PANDORA_HOME + # Copying Pandora FMS console + echo "Copying Pandora FMS Console to $PANDORA_HOME.." + cp -R * $PANDORA_HOME + chmod -R u+rwX,g+rX,g-w,o-rwx $PANDORA_HOME # Creating 'pandora' user @@ -114,53 +114,53 @@ install () { chown -R wwwrun:root $PANDORA_HOME chown -R pandora:www /var/spool/pandora/ fi - - echo "Setting secure permissions for Pandora FMS spool dir..." - chmod -R u+rwX,g+rwX,o-rwx /var/spool/pandora/ - - echo "Done." - echo " " - echo "You have your Pandora FMS console installed on $PANDORA_HOME." + + echo "Setting secure permissions for Pandora FMS spool dir..." + chmod -R u+rwX,g+rwX,o-rwx /var/spool/pandora/ + + echo "Done." + echo " " + echo "You have your Pandora FMS console installed on $PANDORA_HOME." echo " " echo "Now you can setup your Pandora FMS console and install" echo "database using a broser and point to: " echo " " - echo " http://ip_address_of_this_server/pandora/install.php" - echo " " + echo " http://ip_address_of_this_server/pandora/install.php" + echo " " echo " " } help () { - echo " --force-install To force installation if already installed on system " - echo " --install To install Pandora FMS Console on this system" - echo " " + echo " --force-install To force installation if already installed on this system" + echo " --install To install Pandora FMS Console on this system" + echo " " } # Script banner at start echo " " -echo "Pandora FMS Console Installer $PI_VERSION (c) 2008-2009 ArticaST" +echo "Pandora FMS Console Installer $PI_VERSION (c) 2008-2010 ArticaST" echo "This program is licensed under GPL2 Terms. http://pandorafms.com" echo " " case "$MODE" in '--force-install') - FORCE=1 - install - exit - ;; + FORCE=1 + install + exit + ;; '--install') - install - exit - ;; + install + exit + ;; '--uninstall') - uninstall - exit - ;; + uninstall + exit + ;; *) - help + help esac