opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

Fix broken updates (#10380)

This commit is contained in:
Tony Murray 2019-06-26 08:49:04 -05:00 committed by GitHub
parent 82ea43a5e1
commit e8e6ed5142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daily.php
View File

@ -25,13 +25,13 @@ if (isset($options['d'])) {
}
if ($options['f'] === 'update') {
if (!Config::get('base_url')) {
if (!Config::get('update')) {
exit(0);
}
if (Config::get('base_url') == 'master') {
if (Config::get('update_channel') == 'master') {
exit(1);
} elseif (Config::get('base_url') == 'release') {
} elseif (Config::get('update_channel') == 'release') {
exit(3);
}
exit(0);
@ -243,10 +243,10 @@ if ($options['f'] === 'purgeusers') {
}
$purge = 0;
if (is_numeric(\LibreNMS\Config::get('radius.users_purge')) && Config::get('base_url') === 'radius') {
if (is_numeric(\LibreNMS\Config::get('radius.users_purge')) && Config::get('auth_mechanism') === 'radius') {
$purge = \LibreNMS\Config::get('radius.users_purge');
}
if (is_numeric(\LibreNMS\Config::get('active_directory.users_purge')) && Config::get('base_url') === 'active_directory') {
if (is_numeric(\LibreNMS\Config::get('active_directory.users_purge')) && Config::get('auth_mechanism') === 'active_directory') {
$purge = \LibreNMS\Config::get('active_directory.users_purge');
}
if ($purge > 0) {

4
dist-pollers.php
View File

@ -47,8 +47,8 @@ if (isset($options['l'])) {
echo 'Poller '.$options['u']." has been removed\n";
}
} elseif (isset($options['r'])) {
if (dbInsert(['poller_name' => Config::get('base_url'), 'last_polled' => '0000-00-00 00:00:00', 'devices' => 0, 'time_taken' => 0], 'pollers') >= 0) {
echo 'Poller ' . Config::get('base_url') . " has been registered\n";
if (dbInsert(['poller_name' => Config::get('distributed_poller_name'), 'last_polled' => '0000-00-00 00:00:00', 'devices' => 0, 'time_taken' => 0], 'pollers') >= 0) {
echo 'Poller ' . Config::get('distributed_poller_name') . " has been registered\n";
}
} else {
echo "-l pollers | groups List registered pollers or poller groups\n";

2
html/graph-realtime.php
View File

@ -16,7 +16,7 @@
$init_modules = array('web', 'auth');
require realpath(__DIR__ . '/..') . '/includes/init.php';
if (is_numeric($_GET['id']) && (Config::get('base_url') || port_permitted($_GET['id']))) {
if (is_numeric($_GET['id']) && (Config::get('allow_unauth_graphs') || port_permitted($_GET['id']))) {
$port = cleanPort(get_port_by_id($_GET['id']));
$device = device_by_id_cache($port['device_id']);
$title = generate_device_link($device);