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

Alter order of snmp_auth and device_auth config build

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-22 23:44:36 +00:00
parent 7db6593211
commit 8479914b2b
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/App/Netdisco/Configuration.pm
View File

@@ -53,13 +53,12 @@ if (ref {} eq ref setting('database')) {
# always set this
$ENV{DBIC_TRACE_PROFILE} = 'console';
# if snmp_auth or device_auth not set, add defaults to community{_rw}
# if snmp_auth and device_auth not set, add defaults to community{_rw}
if ((setting('snmp_auth') and 0 == scalar @{ setting('snmp_auth') })
or (setting('device_auth') and 0 == scalar @{ setting('device_auth') })) {
and (setting('device_auth') and 0 == scalar @{ setting('device_auth') })) {
config->{'community'} = [ @{setting('community')}, 'public' ];
config->{'community_rw'} = [ @{setting('community_rw')}, 'private' ];
}
# fix up device_auth (or create it from old snmp_auth and community settings)
config->{'device_auth'} = [ App::Netdisco::Util::SNMP::fixup_device_auth() ];

2
lib/App/Netdisco/Util/SNMP.pm
View File

@@ -32,7 +32,7 @@ config changes over time. Returns a list which can replace C<device_auth>.
=cut
sub fixup_device_auth {
my $config = (setting('device_auth') || setting('snmp_auth') || []);
my $config = (setting('snmp_auth') || setting('device_auth'));
my @new_stanzas = ();
# new style snmp config