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

Merge pull request #3341 from wiad/issue-3303

Browse Source 
Support hostnames in rancid with or without domain suffix
This commit is contained in:
Neil Lathwood
2016-04-11 16:43:52 +01:00
parent 554a56acb3 3873aaf01e
commit d936dd5430
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
html/pages/device.inc.php
View File

@@ -327,6 +327,16 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) {
if (is_file($configs.$device['hostname'])) { if (is_file($configs.$device['hostname'])) {
$device_config_file = $configs.$device['hostname']; $device_config_file = $configs.$device['hostname'];
} }
elseif (is_file($configs.strtok($device['hostname'], '.'))) { // Strip domain
$device_config_file = $configs.strtok($device['hostname'], '.');
}
else {
if (!empty($config['mydomain'])) { // Try with domain name if set
if (is_file($configs.$device['hostname'].'.'.$config['mydomain'])) {
$device_config_file = $configs.$device['hostname'].'.'.$config['mydomain'];
}
}
} // end if
} }
if ($config['oxidized']['enabled'] === true && isset($config['oxidized']['url'])) { if ($config['oxidized']['enabled'] === true && isset($config['oxidized']['url'])) {