Allow port_control_reasons setting to actually work

Build.PL

@@ -82,7 +82,7 @@ Module::Build->new(
     'Starman' => '0.4008',
     'Storable' => '0',
     'Sys::SigAction' => '0',
-    'SNMP::Info' => '3.75',
+    'SNMP::Info' => '3.76',
     'SQL::Abstract' => '1.85',
     'SQL::Translator' => '0.11024',
     'Template' => '2.24',

Changes

@@ -1,3 +1,9 @@
+2.049004 - 2021-09-03
+
+  [BUG FIXES]
+
+  * Allow port_control_reasons setting to actually work
+
 2.049003 - 2021-09-03
 
   [ENHANCEMENTS]

lib/App/Netdisco/Configuration.pm

@@ -136,6 +136,11 @@ if ($ENV{NETDISCO_DOMAIN}) {
   }
 }
 
+# check user's port_control_reasons
+
+config->{'port_control_reasons'} =
+  config->{'port_control_reasons'} || config->{'system_port_control_reasons'};
+
 # convert domain_suffix from scalar or list to regexp
 
 config->{'domain_suffix'} = [setting('domain_suffix')]

share/config.yml

@@ -190,7 +190,7 @@ portctl_nowaps: false
 portctl_nophones: false
 portctl_vlans: false
 portctl_uplinks: false
-port_control_reasons:
+system_port_control_reasons:
   address:     'Address Allocation Abuse'
   copyright:   'Copyright Violation'
   dos:         'Denial of Service'