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

move more settings to defaults.inc.php, vastly simplify config.php.default. move collectd functions to html/includes/, include them only where needed.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1390 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-17 20:30:05 +00:00
parent 3063e0e517
commit b0297704e5
12 changed files with 123 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/static-config.php
+4 -23
View File
@@ -265,25 +265,6 @@ $config['os']['3com']['overgraph'][] = "";
$config['os']['3com']['overtext'] = "";
$config['os']['3com']['type'] = "network";
if(!$config['graph_colours']['greens']) {
$config['graph_colours']['greens'] = array('B6D14B','91B13C','6D912D','48721E','24520F','003300');
}
if(!$config['graph_colours']['pinks']) {
$config['graph_colours']['pinks'] = array('D0558F','B34773','943A57','792C38','5C1F1E','401F10');
}
if(!$config['graph_colours']['blues']) {
$config['graph_colours']['blues'] = array('A0A0E5','8080BD','606096','40406F','202048','000033');
}
if(!$config['graph_colours']['purples']) {
$config['graph_colours']['purples'] = array('CC7CCC','AF63AF','934A93','773177','5B185B','3F003F');
}
if(!$config['graph_colours']['default']) {
$config['graph_colours']['default'] = $config['graph_colours']['blues'];
}
if(!$config['graph_colours']['mixed']) {
$config['graph_colours']['mixed'] = array("CC0000", "008C00", "4096EE", "73880A", "D01F3C", "36393D", "FF0084");
}
$device_types = array('server','network','firewall','workstation','printer','power', 'environment');
##############################
@@ -315,13 +296,13 @@ if(isset($_SERVER['HTTPS'])) {
}
### Connect to database
$observernms_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']);
if (!$observernms_link) {
echo "<h2>ObserverNMS MySQL Error</h2>";
$observium_link = mysql_pconnect($config['db_host'], $config['db_user'], $config['db_pass']);
if (!$observium_link) {
echo "<h2>Observer MySQL Error</h2>";
echo mysql_error();
die;
}
$observernms_db = mysql_select_db($config['db_name'], $observernms_link);
$observium_db = mysql_select_db($config['db_name'], $observium_link);
# Set some times needed by loads of scripts (it's dynamic, so we do it here!)