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

move device_auth build to be with community defaults setting

Browse Source
This commit is contained in:
Oliver Gorwits
2017-09-29 07:27:14 +01:00
parent a2de2c1616
commit 4256b117df
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,9 @@ if ((setting('snmp_auth') and 0 == scalar @{ setting('snmp_auth') })
config->{'community_rw'} = [ @{setting('community_rw')}, 'private' ]; 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 # defaults for workers
setting('workers')->{queue} ||= 'PostgreSQL'; setting('workers')->{queue} ||= 'PostgreSQL';
if (exists setting('workers')->{interactives} 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') }; 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 # legacy config item names
config->{'devport_vlan_limit'} = config->{'devport_vlan_limit'} =