#591 domain_suffix can be list and supports (simple) regexp
Squashed commit of the following: commit975e4c6afcAuthor: Oliver Gorwits <oliver@cpan.org> Date: Tue Sep 3 13:35:26 2019 +0100 also support regexp in domain_suffix commit0a2b5c8fa2Author: Oliver Gorwits <oliver@cpan.org> Date: Tue Sep 3 13:17:17 2019 +0100 fix rancid, graph, and nodemonitor commit6d881de3ffAuthor: Oliver Gorwits <oliver@cpan.org> Date: Tue Sep 3 13:11:54 2019 +0100 improve docs and set default domain_suffix to be list commit1dcafc08a8Merge:9a752e0214ac69dcAuthor: Oliver Gorwits <oliver@cpan.org> Date: Tue Sep 3 13:00:39 2019 +0100 Merge branch 'master' into og-multiple-domain-suffix commit9a752e0298Merge:c836619f82a99ea9Author: Oliver Gorwits <oliver@cpan.org> Date: Tue Sep 3 09:45:25 2019 +0100 Merge branch 'master' into og-multiple-domain-suffix commitc836619f8cAuthor: Oliver Gorwits <oliver@cpan.org> Date: Thu Jun 13 07:52:45 2019 +0100 hokey fix for nodes with domains commitfed14bd810Author: 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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user