2010-11-15 Raul Mateos <raulofpandora@gmail.com>

* pandora_agent*, pandora_exec, plugins/pandora_update: Small changes:
	Year, version, spaces to tabs.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3584 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2010-11-15 10:32:23 +00:00
parent d0f9ef293c
commit c59bba0018
7 changed files with 228 additions and 223 deletions

View File

@ -1,3 +1,8 @@
2010-11-15 Raúl Mateos <raulofpandora@gmail.com>
* pandora_agent*, pandora_exec, plugins/pandora_update: Small changes:
Year, version, spaces to tabs.
2010-11-14 Sancho Lerena <slerena@artica.es>
* plugins/pandora_update: Small tool (in perl), used also in windows

View File

@ -468,13 +468,13 @@ sub send_file {
my $dir = dirname ($file);
$output = `ftp -n $Conf{'server_ip'} $Conf{'server_port'} 2>&1 >$DevNull <<FEOF1
quote USER pandora
quote PASS $Conf{'server_pwd'}
lcd "$dir"
cd "$Conf{'server_path'}"
put "$base"
quit
FEOF1`
quote USER pandora
quote PASS $Conf{'server_pwd'}
lcd "$dir"
cd "$Conf{'server_path'}"
put "$base"
quit
FEOF1`
} elsif ($Conf{'transfer_mode'} eq 'local') {
$output = `cp $file $Conf{'server_path'}/ 2>&1 >$DevNull`;
}
@ -525,13 +525,13 @@ sub recv_file ($) {
my $dir = dirname ($file);
$output = `ftp -n $Conf{'server_ip'} $Conf{'server_port'} 2>&1 >$DevNull <<FEOF1
quote USER pandora
quote PASS $Conf{'server_pwd'}
lcd "$Conf{'temporal'}"
cd "$Conf{'server_path'}"
get "$file"
quit
FEOF1`
quote USER pandora
quote PASS $Conf{'server_pwd'}
lcd "$Conf{'temporal'}"
cd "$Conf{'server_path'}"
get "$file"
quit
FEOF1`
} elsif ($Conf{'transfer_mode'} eq 'local') {
$output = `cp $Conf{'server_path'}/$file $Conf{'temporal'} 2>&1 >$DevNull`;
}

View File

@ -2,7 +2,7 @@
#Pandora FMS Linux Agent
#
%define name pandorafms_agent_unix
%define version 3.2dev
%define version 3.2
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}
Version: %{version}

View File

@ -6,7 +6,7 @@
# (c) 2008-2010 Sancho Lerena <slerena@gmail.com>
#
# Please see http://www.pandorafms.org
# v3.1 Build 100515
# v3.2 Build 101115
# This code is licensed under GPL 2.0 license.
# **********************************************************************
@ -115,7 +115,7 @@ case "$1" in
;;
*)
echo "Uso: /etc/init.d/pandora_agent_daemon {start|stop|restart|status}"
echo "Usage: /etc/init.d/pandora_agent_daemon {start|stop|restart|status}"
exit 1
esac

View File

@ -9,8 +9,8 @@
# Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
# **********************************************************************
PI_VERSION=3.1
PI_BUILD=100515
PI_VERSION=3.2
PI_BUILD=101115
OS_NAME=`uname -s`
FORCE=0

View File

@ -8,8 +8,8 @@
#
# Usage: pandora_exec <timeout in seconds> <command>
##########################################################################
# Copyright (c) 2008 Ramon Novoa, rnovoa@gmail.com
# (c) 2008 Artica Soluciones Tecnologicas S.L
# Copyright (c) 2008-2010 Ramon Novoa, rnovoa@gmail.com
# (c) 2008-2010 Artica Soluciones Tecnologicas S.L
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License