From b4a1f516751483f31ab7310899fe68a63d4f5d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= Date: Wed, 26 Aug 2015 10:39:12 +0200 Subject: [PATCH] Fixes #4048 Reading fai-monitor configuration in LDAP --- argonaut-fai-server/bin/argonaut-fai-monitor | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/argonaut-fai-server/bin/argonaut-fai-monitor b/argonaut-fai-server/bin/argonaut-fai-monitor index 54d4819..075e151 100644 --- a/argonaut-fai-server/bin/argonaut-fai-monitor +++ b/argonaut-fai-server/bin/argonaut-fai-monitor @@ -51,9 +51,18 @@ my $logfile = "argonaut-fai-monitor.log"; my $config = argonaut_read_config; -my $client_settings = argonaut_get_client_settings($config,$config->{'client_ip'}); +my $settings = argonaut_get_generic_settings( + 'argonautFAIMonitorConfig', + { + 'logdir' => "argonautFAIMonitorLogDir", + 'cacertfile' => "argonautFAIMonitorCaCertPath", + 'port' => "argonautFAIMonitorPort", + 'timeout' => "argonautFAIMonitorTimeout" + }, + $config,$config->{'client_ip'} +); -my $logdir = $client_settings->{'logdir'}; +my $logdir = $settings->{'logdir'}; my $server_settings = argonaut_get_server_settings($config,$config->{'server_ip'}); @@ -128,7 +137,7 @@ sub rpc_call if ($client->ua->can('ssl_opts')) { $client->ua->ssl_opts( verify_hostname => 1, - SSL_ca_file => $client_settings->{'cacertfile'}, + SSL_ca_file => $settings->{'cacertfile'}, SSL_verifycn_name => $server_settings->{'certcn'} ); } @@ -282,8 +291,12 @@ EOF getopts('hp:t:') || usage; $opt_h && usage; -$port = $opt_p || 4711; -$timeout = $opt_t || 5; +$port = $opt_p || $settings->{'port'}; +if (defined $opt_t) { + $timeout = $opt_t; +} else { + $timeout = $settings-{'timeout'}; +} server_init($port); big_loop; -- 1.7.10.4