From c422f29fb48ca4d5300eb6ef0fde333ca686c779 Mon Sep 17 00:00:00 2001 From: laf Date: Thu, 16 Jan 2014 11:21:22 +0000 Subject: [PATCH] Moved some variables from defaults.inc.php to definitions.inc.php --- includes/defaults.inc.php | 8 ++++---- includes/definitions.inc.php | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index e96e505f6..dbaf5fd1b 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -32,10 +32,10 @@ $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"; +//$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"; diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index dae7f7062..9e99b41b7 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -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"; } + ?>