Use Config helper (#10339)

remove usage of global variable
This commit is contained in:
Tony Murray
2019-06-23 00:29:12 -05:00
committed by GitHub
parent 342acf50f1
commit f3ba8947f7
367 changed files with 1589 additions and 1857 deletions

View File

@@ -82,14 +82,15 @@ Artisan::command('device:add
$additional['ping_fallback'] = 1;
}
global $config;
if ($this->option('community')) {
array_unshift($config['snmp']['community'], $this->option('community'));
$community_config = \LibreNMS\Config::get('snmp.community');
array_unshift($community_config, $this->option('community'));
\LibreNMS\Config::set('snmp.community', $community_config);
}
$auth = $this->option('auth-password');
$priv = $this->option('privacy-password');
array_unshift($config['snmp']['v3'], [
$v3_config = \LibreNMS\Config::get('snmp.v3');
array_unshift($v3_config, [
'authlevel' => ($auth ? 'auth' : 'noAuth') . (($priv && $auth) ? 'Priv' : 'NoPriv'),
'authname' => $this->option('security-name'),
'authpass' => $this->option('auth-password'),
@@ -97,6 +98,7 @@ Artisan::command('device:add
'cryptopass' => $this->option('privacy-password'),
'cryptoalgo' => $this->option('privacy-protocol'),
]);
\LibreNMS\Config::set('snmp.v3', $v3_config);
try {
$init_modules = [];