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

Allow port_control_reasons setting to actually work

Browse Source
This commit is contained in:
Oliver Gorwits
2021-09-03 21:17:11 +01:00
parent 9e9b0489e5
commit 43ce26ef3d
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Build.PL
View File

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

6
Changes
View File

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

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

@@ -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 # convert domain_suffix from scalar or list to regexp
config->{'domain_suffix'} = [setting('domain_suffix')] config->{'domain_suffix'} = [setting('domain_suffix')]

2
share/config.yml
View File

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