2008-03-25 Ramon Novoa <rnovoa@artica.es>

* 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
This commit is contained in:
Ramon Novoa 2008-03-25 17:00:32 +00:00
parent 29f072662b
commit 1cb9fe1910
6 changed files with 15 additions and 8 deletions

View File

@ -1,3 +1,10 @@
2008-03-25 Ramon Novoa <rnovoa@artica.es>
* 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 <raulofpandora@gmail.com>
* pandora_agent.conf: Corrected some texts.

View File

@ -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

View File

@ -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;

View File

@ -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
# =================

View File

@ -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.

View File

@ -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,