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

Merge branch 'master' into og-newnetmap

Browse Source
This commit is contained in:
Oliver Gorwits
2017-12-31 08:59:19 +00:00
parent 66e353669d 07446ed7d6
commit 85d52ed174
7 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Changes
View File

@@ -1,3 +1,9 @@
2.037005 - 2017-12-22
[BUG FIXES]
* Alter order of snmp_auth and device_auth config build
2.037004 - 2017-12-21 2.037004 - 2017-12-21
[BUG FIXES] [BUG FIXES]

6
META.json
View File

@@ -105,7 +105,7 @@
"provides" : { "provides" : {
"App::Netdisco" : { "App::Netdisco" : {
"file" : "lib/App/Netdisco.pm", "file" : "lib/App/Netdisco.pm",
"version" : "2.037004" "version" : "2.037005"
}, },
"App::Netdisco::AnyEvent::Nbtstat" : { "App::Netdisco::AnyEvent::Nbtstat" : {
"file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm" "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -752,7 +752,7 @@
}, },
"homepage" : "http://netdisco.org/", "homepage" : "http://netdisco.org/",
"license" : [ "license" : [
"http://opensource.org/licenses/bsd-license.php" "http://opensource.org/licenses/BSD-3-Clause"
], ],
"repository" : { "repository" : {
"url" : "https://github.com/netdisco/netdisco" "url" : "https://github.com/netdisco/netdisco"
@@ -760,6 +760,6 @@
"x_IRC" : "irc://irc.freenode.org/#netdisco", "x_IRC" : "irc://irc.freenode.org/#netdisco",
"x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users" "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
}, },
"version" : "2.037004", "version" : "2.037005",
"x_serialization_backend" : "JSON::PP version 2.94" "x_serialization_backend" : "JSON::PP version 2.94"
} }

6
META.yml
View File

@@ -18,7 +18,7 @@ name: App-Netdisco
provides: provides:
App::Netdisco: App::Netdisco:
file: lib/App/Netdisco.pm file: lib/App/Netdisco.pm
version: '2.037004' version: '2.037005'
App::Netdisco::AnyEvent::Nbtstat: App::Netdisco::AnyEvent::Nbtstat:
file: lib/App/Netdisco/AnyEvent/Nbtstat.pm file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
App::Netdisco::Backend::Job: App::Netdisco::Backend::Job:
@@ -520,7 +520,7 @@ resources:
MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users
bugtracker: https://github.com/netdisco/netdisco/issues bugtracker: https://github.com/netdisco/netdisco/issues
homepage: http://netdisco.org/ homepage: http://netdisco.org/
license: http://opensource.org/licenses/bsd-license.php license: http://opensource.org/licenses/BSD-3-Clause
repository: https://github.com/netdisco/netdisco repository: https://github.com/netdisco/netdisco
version: '2.037004' version: '2.037005'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018' x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

2
lib/App/Netdisco.pm
View File

@@ -4,7 +4,7 @@ use strict;
use warnings; use warnings;
use 5.010_000; use 5.010_000;
our $VERSION = '2.037004'; our $VERSION = '2.037005';
use App::Netdisco::Configuration; use App::Netdisco::Configuration;
=head1 NAME =head1 NAME

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

@@ -53,13 +53,12 @@ if (ref {} eq ref setting('database')) {
# always set this # always set this
$ENV{DBIC_TRACE_PROFILE} = 'console'; $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') }) 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'} = [ @{setting('community')}, 'public' ];
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) # fix up device_auth (or create it from old snmp_auth and community settings)
config->{'device_auth'} = [ App::Netdisco::Util::SNMP::fixup_device_auth() ]; 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 =cut
sub fixup_device_auth { sub fixup_device_auth {
my $config = (setting('device_auth') || setting('snmp_auth') || []); my $config = (setting('snmp_auth') || setting('device_auth'));
my @new_stanzas = (); my @new_stanzas = ();
# new style snmp config # new style snmp config

2
share/config.yml
View File

@@ -188,7 +188,7 @@ host_group_displaynames: {}
device_identity: [] device_identity: []
community: [] community: []
community_rw: [] community_rw: []
snmp_auth: [] device_auth: []
get_community: "" get_community: ""
bulkwalk_off: false bulkwalk_off: false
bulkwalk_no: [] bulkwalk_no: []