From 4256b117dfb79eef8f738de661a8656d1de70b5f Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Fri, 29 Sep 2017 07:27:14 +0100 Subject: [PATCH] move device_auth build to be with community defaults setting --- lib/App/Netdisco/Configuration.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/App/Netdisco/Configuration.pm b/lib/App/Netdisco/Configuration.pm index 44e24781..3805c30e 100644 --- a/lib/App/Netdisco/Configuration.pm +++ b/lib/App/Netdisco/Configuration.pm @@ -60,6 +60,9 @@ if ((setting('snmp_auth') and 0 == scalar @{ setting('snmp_auth') }) 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() ]; + # defaults for workers setting('workers')->{queue} ||= 'PostgreSQL'; if (exists setting('workers')->{interactives} @@ -118,9 +121,6 @@ foreach my $name (qw/discover_only macsuck_only arpnip_only nbtstat_only/) { push @{setting($name)}, @{ setting('devices_only') }; } -# fix up device_auth (or create it from old snmp_auth setting) -config->{'device_auth'} = [ App::Netdisco::Util::SNMP::fixup_device_auth() ]; - # legacy config item names config->{'devport_vlan_limit'} =