mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix broken updates (#10380)

Browse Source
This commit is contained in:
Tony Murray
2019-06-26 08:49:04 -05:00
committed by GitHub
parent 82ea43a5e1
commit e8e6ed5142
3 changed files with 8 additions and 8 deletions
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) {