04798eb866
Move config files to standard location. Make Apache/Nginx compatible (based on mail/rouncube). Upstream changes follow. 3.7.1 * Fix for auth bypass when using the authentication module * Fix for a XSS in the view adding interface * Update JQuery Mobile library to 1.4.5 3.7.0 * Cubism integration * Ganglia Reporting * Couple reported XSS issues have been corrected 3.6.2 * Performance improvements * New clearer heatmaps * Other minor improvements and fixes 3.5.7 * Required Jquery files were missing from 3.5.6 release. 3.5.6 * Number of fixes to address XSS (Cross Site Scripting) issues * Enhancement to the host view if use option "metric_groups_initially_collapsed". Clicking on metric groups dynamically loads images instead of reloading the page * Fixed mobile view * Incorporate legend in the selection when doing Inspect graph * Stacked graph fixes * Numerous other fixes and enhancements 3.5.2 * Fix for stacked graphs not showing after upgrading to 3.5.1 * Inspect graph now uses AJAX calls to retrieve data which should help in situations where users use Basic authentication 3.5.1 * Security advisory * Support for same hostname being in multiple clusters 3.5.0 * Enable zoom to a selection in Inspect Graph * Add Jump to Metric group drop down * Add Timeshift functionality to graphs * Other misc fixes and improvements 3.4.2 * Improvements to the live dashboard * Fixed the aggregate graphs metric auto complete which broke in 3.4.1 * Add ability to specify critical and warning thresholds. Use in Live Dashboard and Views. * Minor bug fixes 3.4.1 * Major improvements to Inspect Graph thanks to Peter Piela - deselect all data sources, select individual sources, change graph type from stack to line and vice versa * Live Dashboard - integration of Tasseo * Metrics drop down now includes ability to select optional reports No changelog could be found for 3.1.3-3.4.0.
35 lines
1.3 KiB
PHP
35 lines
1.3 KiB
PHP
$NetBSD: patch-conf__default.php.in,v 1.1 2016/02/16 13:05:23 fhajny Exp $
|
|
|
|
Assert proper paths.
|
|
|
|
--- conf_default.php.in.orig 2015-10-01 15:47:41.000000000 +0000
|
|
+++ conf_default.php.in
|
|
@@ -11,6 +11,7 @@
|
|
#
|
|
$conf['gweb_root'] = dirname(__FILE__);
|
|
$conf['gweb_confdir'] = "@vargwebstatedir@";
|
|
+$conf['gweb_sysconfdir'] = "@etcdir@";
|
|
|
|
include_once $conf['gweb_root'] . "/version.php";
|
|
|
|
@@ -42,16 +43,16 @@ $conf['dwoo_compiled_dir'] = "${conf['gw
|
|
$conf['dwoo_cache_dir'] = "${conf['gweb_confdir']}/dwoo/cache";
|
|
|
|
# Where to store web-based configuration
|
|
-$conf['views_dir'] = $conf['gweb_confdir'] . '/conf';
|
|
-$conf['conf_dir'] = $conf['gweb_confdir'] . '/conf';
|
|
+$conf['views_dir'] = $conf['gweb_sysconfdir'];
|
|
+$conf['conf_dir'] = $conf['gweb_sysconfdir'];
|
|
|
|
# Where to find filter configuration files, if not set filtering
|
|
# will be disabled
|
|
-#$conf['filter_dir'] = "${conf['gweb_confdir']}/filters";
|
|
+#$conf['filter_dir'] = "${conf['gweb_sysconfdir']}/filters";
|
|
|
|
# Leave this alone if rrdtool is installed in $conf['gmetad_root'],
|
|
# otherwise, change it if it is installed elsewhere (like /usr/bin)
|
|
-$conf['rrdtool'] = "/usr/bin/rrdtool";
|
|
+$conf['rrdtool'] = "@PREFIX@/bin/rrdtool";
|
|
|
|
# Render graphs with rrdtool's --slope-mode option
|
|
$conf['rrdtool_slope_mode'] = true;
|