From 8e8c145d85f16d599695bbc1f59b3a327bf74662 Mon Sep 17 00:00:00 2001 From: ramonn Date: Tue, 25 Mar 2008 17:00:32 +0000 Subject: [PATCH] 2008-03-25 Ramon Novoa * ftp/pandora_ftp_test.cc, installer/pandora_1.3.mpi, installer/README.txt, pandora_windows_service.cc, bin/pandora_agent.conf: Variable ftp_password removed from configuration file, server_pwd is used instead. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@763 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/win32/ChangeLog | 7 +++++++ pandora_agents/win32/bin/pandora_agent.conf | 2 +- pandora_agents/win32/ftp/pandora_ftp_test.cc | 4 ++-- pandora_agents/win32/installer/README.txt | 4 ++-- pandora_agents/win32/installer/pandora_1.3.mpi | 4 ++-- pandora_agents/win32/pandora_windows_service.cc | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index ebfaf904d4..9a4f3d3da8 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,10 @@ +2008-03-25 Ramon Novoa + + * ftp/pandora_ftp_test.cc, installer/pandora_1.3.mpi, + installer/README.txt, pandora_windows_service.cc, + bin/pandora_agent.conf: Variable ftp_password removed from + configuration file, server_pwd is used instead. + 2007-09-17 Raul Mateos * pandora_agent.conf: Corrected some texts. diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index 2093cf13aa..414056ba8a 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -30,7 +30,7 @@ interval 300 # By default FTP is configured. To use SSH, just comment next two lines transfer_mode ftp -ftp_password pandora123 +server_pwd pandora123 # Debug mode do not copy XML data files to server and stop executing after first one # debug 1 diff --git a/pandora_agents/win32/ftp/pandora_ftp_test.cc b/pandora_agents/win32/ftp/pandora_ftp_test.cc index b73a684888..39ec399bd8 100644 --- a/pandora_agents/win32/ftp/pandora_ftp_test.cc +++ b/pandora_agents/win32/ftp/pandora_ftp_test.cc @@ -82,10 +82,10 @@ Pandora_FTP_Test::test () { remote_host = this->conf->getValue ("server_ip"); cout << "Connecting with " << remote_host << "..." << endl; - password = this->conf->getValue ("ftp_password"); + password = this->conf->getValue ("server_pwd"); if (password == "") { cout << "FTP password not found in configuration file." << endl; - cout << "Check that ftp_password variable is set." << endl; + cout << "Check that server_pwd variable is set." << endl; return; } cout << "Username: pandora" << endl; diff --git a/pandora_agents/win32/installer/README.txt b/pandora_agents/win32/installer/README.txt index 9f9ef06803..8221e6d1e2 100644 --- a/pandora_agents/win32/installer/README.txt +++ b/pandora_agents/win32/installer/README.txt @@ -61,7 +61,7 @@ The general parameters of the agent configuration are defined in this section. S * Transfer Mode: This parametrer let you specify which transfer mode is going to be set up to send the agent data to the server. Modes available are: ssh (using scp), ftp or local. Local mode it is only for systems where the agent run in the same machine as the server does, cause it is basically a copy between directories. - * ftp_password: Specify password for FTP transfer mode (Windows only). + * server_pwd: Specify password for FTP transfer mode (Windows only). * encoding: Set the encoding type of your local system, like iso-8859-15, or utf-8. @@ -264,7 +264,7 @@ All setup is made in pandora_agent.conf. This file is a list of keys/values pair interval 300 agent_name localhost transfer_mode ftp - ftp_password pandora123 + server_pwd pandora123 # Module Definition # ================= diff --git a/pandora_agents/win32/installer/pandora_1.3.mpi b/pandora_agents/win32/installer/pandora_1.3.mpi index 191a55fc79..30ee9d9789 100644 --- a/pandora_agents/win32/installer/pandora_1.3.mpi +++ b/pandora_agents/win32/installer/pandora_1.3.mpi @@ -1376,7 +1376,7 @@ C6CE92F8-3842-4E58-A3A2-5B5D2F7AFB4B,Message Now the pandora_agent.conf file will be open to change Pandora FMS Server IP address and agent name (used in Web Console). -If you use FTP method to transfer data files, configure ftp_password with the pandora user password in the FTP server. This user should have write permissions in the server directory, by default /var/spool/pandora/data_in. +If you use FTP method to transfer data files, configure server_pwd with the pandora user password in the FTP server. This user should have write permissions in the server directory, by default /var/spool/pandora/data_in. If you want to use SSH, comment FTP parameters and generate SSH Keys. @@ -1547,7 +1547,7 @@ C6CE92F8-3842-4E58-A3A2-5B5D2F7AFB4B,Message Ahora se abrirá el fichero pandora_agent.conf para configurar la dirección IP del servidor y el nombre del agente (se utilizará en la consola web). -Si el método de transferencia de ficheros que se va a utilizar es FTP, el parámetro ftp_password contiene la contraseña del usuario pandora, que debe tener permisos de escritura en el directorio del servidor, por defecto /var/spool/pandora/data_in. +Si el método de transferencia de ficheros que se va a utilizar es FTP, el parámetro server_pwd contiene la contraseña del usuario pandora, que debe tener permisos de escritura en el directorio del servidor, por defecto /var/spool/pandora/data_in. Si se quiere utilizar SSH, deben comentarse las entradas relativas a FTP y generar las claves SSH. diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc index 4302b065d6..132b2076b4 100644 --- a/pandora_agents/win32/pandora_windows_service.cc +++ b/pandora_agents/win32/pandora_windows_service.cc @@ -296,7 +296,7 @@ Pandora_Windows_Service::copyFtpDataFile (string host, } filepath += filename; - password = conf->getValue ("ftp_password"); + password = conf->getValue ("server_pwd"); ftp_client.connect (host, 22,