135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix rancid, graph, and nodemonitor

Browse Source
This commit is contained in:
Oliver Gorwits
2019-09-03 13:17:17 +01:00
parent 6d881de3ff
commit 0a2b5c8fa2
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm
View File

@@ -18,7 +18,7 @@ register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_;
my $config = setting('rancid') || {};
my $domain_suffix = setting('domain_suffix') || '';
my $domain_suffix = setting('domain_suffix');
my $delimiter = $config->{delimiter} || ';';
my $down_age = $config->{down_age} || '1 day';
my $default_group = $config->{default_group} || 'default';
@@ -65,7 +65,7 @@ register_worker({ phase => 'main' }, sub {
}
my $name = check_acl_no($d, $config->{by_ip}) ? $d->ip : ($d->dns || $d->name);
$name =~ s/$domain_suffix$// if check_acl_no($d, $config->{by_hostname});
$name =~ s/$domain_suffix// if check_acl_no($d, $config->{by_hostname});
my ($group) =
(pairkeys pairfirst { check_acl_no($d, $b) } %{ $config->{groups} }) || $default_group;