Skip to content

Commit

Permalink
Make the master check the node entry for a "tls" configuration option…
Browse files Browse the repository at this point in the history
… before

using the global value.  With this option, tls can now be disabled on a per
node basis, resolving #880.
  • Loading branch information
Brian De Wolf committed Apr 9, 2011
1 parent db96887 commit 2cc54d9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion master/lib/Munin/Master/Node.pm
Expand Up @@ -142,7 +142,8 @@ sub _run_starttls_if_required {

# TLS should only be attempted if explicitly enabled. The default
# value is therefore "disabled" (and not "auto" as before).
my $tls_requirement = $config->{tls};
my $tls_requirement = exists $self->{configref}->{tls} ?
$self->{configref}->{tls} : $config->{tls};
DEBUG "TLS set to \"$tls_requirement\".";
return if $tls_requirement eq 'disabled';
my $logger = Log::Log4perl->get_logger("Munin::Master");
Expand Down

0 comments on commit 2cc54d9

Please sign in to comment.