tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-03-17 Dario Rodriguez <dario.rodriguez@artica.es> 

* unix/pandora_agent: Fixed a typo with logfile parameter. Also fixed
	the gathering of secondary_server_opts parameters when transfer mode is 
	Tentacle. Thanks to KIKUCHI Koichiro for the report.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4103 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2011-03-17 13:49:15 +00:00
parent cb4a15cf97
commit 7a6f73ecc6
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_agents/ChangeLog
View File

@ -1,3 +1,9 @@
2011-03-17 Dario Rodriguez <dario.rodriguez@artica.es>
* unix/pandora_agent: Fixed a typo with logfile parameter. Also fixed
the gathering of secondary_server_opts parameters when transfer mode is
Tentacle. Thanks to KIKUCHI Koichiro for the report.
2011-03-02 Ramon Novoa <rnovoa@artica.es> 2011-03-02 Ramon Novoa <rnovoa@artica.es>
* win32/modules/pandora_module_factory.cc, unix/pandora_agent: Changed * win32/modules/pandora_module_factory.cc, unix/pandora_agent: Changed

8
pandora_agents/unix/pandora_agent
View File

@ -117,8 +117,8 @@ my $ConfFile = 'pandora_agent.conf';
my %Conf = ( my %Conf = (
'server_ip' => 'localhost', 'server_ip' => 'localhost',
'server_path' => '/var/spool/pandora/data_in', 'server_path' => '/var/spool/pandora/data_in',
'logfile' =>'/var/log/pandora/pandora_agent.log',
'temporal' => '/var/spool/pandora', 'temporal' => '/var/spool/pandora',
'log_file' => '/var/log/pandora/pandora_agent.log',
'interval' => 300, 'interval' => 300,
'debug' => 0, 'debug' => 0,
'agent_name' => hostname (), 'agent_name' => hostname (),
@ -438,6 +438,12 @@ sub read_config (;$) {
$Conf{'server_opts'} = '-c ' . $Conf{'server_opts'} if ($Conf{'server_ssl'} eq 'yes'); $Conf{'server_opts'} = '-c ' . $Conf{'server_opts'} if ($Conf{'server_ssl'} eq 'yes');
} }
# Set tentacle client options for secondary server
if ($Conf{'secondary_transfer_mode'} eq 'tentacle') {
$Conf{'secondary_server_opts'} = '-x \'' . $Conf{'secondary_server_pwd'} . '\' ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_pwd'} ne '');
$Conf{'secondary_server_opts'} = '-c ' . $Conf{'secondary_server_opts'} if ($Conf{'secondary_server_ssl'} eq 'yes');
}
close (CONF_FILE); close (CONF_FILE);
} }