#591 domain_suffix can be list and supports (simple) regexp

Squashed commit of the following:

commit 975e4c6afc
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Sep 3 13:35:26 2019 +0100

    also support regexp in domain_suffix

commit 0a2b5c8fa2
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Sep 3 13:17:17 2019 +0100

    fix rancid, graph, and nodemonitor

commit 6d881de3ff
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Sep 3 13:11:54 2019 +0100

    improve docs and set default domain_suffix to be list

commit 1dcafc08a8
Merge: 9a752e02 14ac69dc
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Sep 3 13:00:39 2019 +0100

    Merge branch 'master' into og-multiple-domain-suffix

commit 9a752e0298
Merge: c836619f 82a99ea9
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Tue Sep 3 09:45:25 2019 +0100

    Merge branch 'master' into og-multiple-domain-suffix

commit c836619f8c
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Jun 13 07:52:45 2019 +0100

    hokey fix for nodes with domains

commit fed14bd810
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Thu Jun 13 07:02:09 2019 +0100

    basic implementation, rancid graph and nodemonitor missing
This commit is contained in:
Oliver Gorwits
2019-09-03 13:35:43 +01:00
parent 14ac69dc2e
commit 542837d266
12 changed files with 58 additions and 25 deletions

View File

@@ -171,11 +171,14 @@ ajax '/ajax/content/search/node' => require_login sub {
->search_by_ip({ip => $ip, @active, @times});
}
else {
$likeval .= setting('domain_suffix')
if index($node, setting('domain_suffix')) == -1;
$set = schema('netdisco')->resultset('NodeIp')
->search_by_dns({dns => $likeval, @active, @times});
->search_by_dns({
($using_wildcards ? (dns => $likeval) :
(dns => "${likeval}.\%",
suffix => setting('domain_suffix'))),
@active,
@times,
});
# if the user selects Vendor search opt, then
# we'll try the OUI company name as a fallback