diff --git a/config.php.default b/config.php.default index b1532465de..1aeeaccd54 100755 --- a/config.php.default +++ b/config.php.default @@ -9,7 +9,7 @@ $config['db_name'] = "observer"; ### Locations $config['install_dir'] = "/opt/observer"; $config['html_dir'] = $config['install_dir'] . "/html"; -$config['rrd_dir'] = "/mnt/filesystem/rrd"; +$config['rrd_dir'] = "/opt/observer/rrd"; $config['temp_dir'] = "/tmp"; $config['observer_log'] = $config['install_dir'] . "/observer.log"; @@ -34,7 +34,7 @@ $config['snmpset'] = "/usr/bin/snmpset"; # Set the general colours and other settings for rrdtool graphs -$config['rrdgraph_def_text'] = " -c BACK#CCCCCC -c SHADEA#c5c5c5 -c SHADEB#c5c5c5 -c FONT#000000 -c CANVAS#FFFFFF -c GRID#a5a5a5 "; +$config['rrdgraph_def_text'] = " -c BACK#EEEEEE -c SHADEA#c5c5c5 -c SHADEB#c5c5c5 -c FONT#000000 -c CANVAS#FFFFFF -c GRID#a5a5a5 "; $config['rrdgraph_def_text'] .= " -c MGRID#FF9999 -c FRAME#5e5e5e -c ARROW#5e5e5e -R normal"; $config['overlib_defaults'] = ",FGCOLOR,'#e5e5e5', BGCOLOR, '#c0c0c0', BORDER, 5, CELLPAD, 4, CAPCOLOR, '#050505'"; @@ -46,8 +46,8 @@ $config['nets'] = array ("89.21.224.0/19", "212.9.12.0/24", "212.9.13.0/24"); $config['mydomain'] = "jerseytelecom.com"; $config['page_title'] = "JT Observer"; $config['title_image'] = "images/observer-logo.jpg"; -$config['stylesheet'] = "css/styles.css"; -$config['mono_font'] = "DejaVuSansMono"; +$config['stylesheet'] = "css/styles.css"; +$config['mono_font'] = "DejaVuSansMono"; $config['header_color'] = "#133A7B"; $config['favicon'] = "favicon.ico"; @@ -120,6 +120,8 @@ $config['allow_entity_sensor']['specialEnum'] = 1; ### Mountpoints to ignore $config['ignore_mount'] = array("/kern", "/mnt/cdrom", "/dev", "/dev/pts", "/proc/bus/usb"); +$config['ignore_mount_regex'] = array(); +$config['ignore_mount_string'] = array(); ### Style Options diff --git a/fonts/DejaVuSans-Bold.ttf b/fonts/DejaVuSans-Bold.ttf deleted file mode 100644 index a3e485b154..0000000000 Binary files a/fonts/DejaVuSans-Bold.ttf and /dev/null differ diff --git a/fonts/DejaVuSans-BoldOblique.ttf b/fonts/DejaVuSans-BoldOblique.ttf deleted file mode 100644 index 82c857119f..0000000000 Binary files a/fonts/DejaVuSans-BoldOblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSans-ExtraLight.ttf b/fonts/DejaVuSans-ExtraLight.ttf deleted file mode 100644 index e2cab9079e..0000000000 Binary files a/fonts/DejaVuSans-ExtraLight.ttf and /dev/null differ diff --git a/fonts/DejaVuSans-Oblique.ttf b/fonts/DejaVuSans-Oblique.ttf deleted file mode 100644 index d14947fc80..0000000000 Binary files a/fonts/DejaVuSans-Oblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSans.ttf b/fonts/DejaVuSans.ttf deleted file mode 100644 index 6a0ad261a1..0000000000 Binary files a/fonts/DejaVuSans.ttf and /dev/null differ diff --git a/fonts/DejaVuSansCondensed-Bold.ttf b/fonts/DejaVuSansCondensed-Bold.ttf deleted file mode 100644 index ca75f7ba80..0000000000 Binary files a/fonts/DejaVuSansCondensed-Bold.ttf and /dev/null differ diff --git a/fonts/DejaVuSansCondensed-BoldOblique.ttf b/fonts/DejaVuSansCondensed-BoldOblique.ttf deleted file mode 100644 index b818dde46c..0000000000 Binary files a/fonts/DejaVuSansCondensed-BoldOblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSansCondensed-Oblique.ttf b/fonts/DejaVuSansCondensed-Oblique.ttf deleted file mode 100644 index c64bf51f7b..0000000000 Binary files a/fonts/DejaVuSansCondensed-Oblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSansCondensed.ttf b/fonts/DejaVuSansCondensed.ttf deleted file mode 100644 index e58bd15bd5..0000000000 Binary files a/fonts/DejaVuSansCondensed.ttf and /dev/null differ diff --git a/fonts/DejaVuSansMono-Bold.ttf b/fonts/DejaVuSansMono-Bold.ttf deleted file mode 100644 index a541774019..0000000000 Binary files a/fonts/DejaVuSansMono-Bold.ttf and /dev/null differ diff --git a/fonts/DejaVuSansMono-BoldOblique.ttf b/fonts/DejaVuSansMono-BoldOblique.ttf deleted file mode 100644 index 21a01b15ad..0000000000 Binary files a/fonts/DejaVuSansMono-BoldOblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSansMono-Oblique.ttf b/fonts/DejaVuSansMono-Oblique.ttf deleted file mode 100644 index 92eb5ed00f..0000000000 Binary files a/fonts/DejaVuSansMono-Oblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSansMono.ttf b/fonts/DejaVuSansMono.ttf deleted file mode 100644 index bf798a860f..0000000000 Binary files a/fonts/DejaVuSansMono.ttf and /dev/null differ diff --git a/fonts/DejaVuSerif-Bold.ttf b/fonts/DejaVuSerif-Bold.ttf deleted file mode 100644 index 6a5ce1cb04..0000000000 Binary files a/fonts/DejaVuSerif-Bold.ttf and /dev/null differ diff --git a/fonts/DejaVuSerif-BoldOblique.ttf b/fonts/DejaVuSerif-BoldOblique.ttf deleted file mode 100644 index 7c30628465..0000000000 Binary files a/fonts/DejaVuSerif-BoldOblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSerif-Oblique.ttf b/fonts/DejaVuSerif-Oblique.ttf deleted file mode 100644 index 8d2d9a6bc8..0000000000 Binary files a/fonts/DejaVuSerif-Oblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSerif.ttf b/fonts/DejaVuSerif.ttf deleted file mode 100644 index fcc33419e8..0000000000 Binary files a/fonts/DejaVuSerif.ttf and /dev/null differ diff --git a/fonts/DejaVuSerifCondensed-Bold.ttf b/fonts/DejaVuSerifCondensed-Bold.ttf deleted file mode 100644 index 7fa5d332e9..0000000000 Binary files a/fonts/DejaVuSerifCondensed-Bold.ttf and /dev/null differ diff --git a/fonts/DejaVuSerifCondensed-BoldOblique.ttf b/fonts/DejaVuSerifCondensed-BoldOblique.ttf deleted file mode 100644 index 0a05a163c8..0000000000 Binary files a/fonts/DejaVuSerifCondensed-BoldOblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSerifCondensed-Oblique.ttf b/fonts/DejaVuSerifCondensed-Oblique.ttf deleted file mode 100644 index a1742d2875..0000000000 Binary files a/fonts/DejaVuSerifCondensed-Oblique.ttf and /dev/null differ diff --git a/fonts/DejaVuSerifCondensed.ttf b/fonts/DejaVuSerifCondensed.ttf deleted file mode 100644 index 2b84f035e9..0000000000 Binary files a/fonts/DejaVuSerifCondensed.ttf and /dev/null differ diff --git a/html/includes/graphs/common.inc.php b/html/includes/graphs/common.inc.php index 86c7177c47..232c006bb3 100644 --- a/html/includes/graphs/common.inc.php +++ b/html/includes/graphs/common.inc.php @@ -20,7 +20,7 @@ if($_GET['bg']) { $rrd_options .= " -c CANVAS#" . mres($_GET['bg']) . " "; } #$rrd_options .= " -c BACK#FFFFFF"; if($height < "99") { $rrd_options .= " --only-graph"; } -if($width <= "300") { $rrd_options .= " --font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal"; -} else { $rrd_options .= " --font LEGEND:8:".$config['mono_font']." --font AXIS:7:".$config['mono_font']." --font-render-mode normal"; } +if($width <= "300") { $rrd_options .= " --font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']; +} else { $rrd_options .= " --font LEGEND:8:".$config['mono_font']." --font AXIS:7:".$config['mono_font']; } ?>