Merge branch 'master' into og-newnetmap

Changes

@@ -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
 
   [BUG FIXES]

META.json

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

META.yml

@@ -18,7 +18,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.037004'
+    version: '2.037005'
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -520,7 +520,7 @@ resources:
   MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users
   bugtracker: https://github.com/netdisco/netdisco/issues
   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
-version: '2.037004'
+version: '2.037005'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

lib/App/Netdisco.pm

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

lib/App/Netdisco/Configuration.pm

@@ -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() ];
 

lib/App/Netdisco/Util/SNMP.pm

@@ -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

share/config.yml

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