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 #66 from laf/issue-65

Browse Source 
Moved some variables from defaults.inc.php to definitions.inc.php
This commit is contained in:
Paul Gear
2014-02-23 22:19:35 +10:00
parent affc283f25 26bbb4f14a
commit e63a5c15ab
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/defaults.inc.php
View File

@@ -32,10 +32,6 @@ $config['project_id'] = strtolower($config['project_name']);
$config['temp_dir'] = "/tmp";
$config['install_dir'] = "/opt/" . $config['project_id'];
$config['html_dir'] = $config['install_dir'] . "/html";
$config['rrd_dir'] = $config['install_dir'] . "/rrd";
$config['log_dir'] = $config['install_dir'] . "/logs";
$config['log_file'] = $config['log_dir'] . "/" . $config['project_id'] . ".log";
// What is my own hostname (used to identify this host in its own database)
$config['own_hostname'] = "localhost";

6
includes/definitions.inc.php
View File

@@ -1213,4 +1213,10 @@ $config['ipmi_unit']['discrete'] = '';
// INCLUDE THE VMWARE DEFINITION FILE.
require_once("vmware_guestid.inc.php");
// Define some variables if they aren't set by user definition in config.php
if (!isset($config['html_dir'])) { $config['html_dir'] = $config['install_dir'] . '/html'; }
if (!isset($config['rrd_dir'])) { $config['rrd_dir'] = $config['install_dir'] . '/rrd'; }
if (!isset($config['log_dir'])) { $config['log_dir'] = $config['install_dir'] . '/logs'; }
if (!isset($config['log_file'])) { $config['log_dir'] . "/" . $config['project_id'] . ".log"; }
?>