3c1d1d67ac
Important Security Fixes CVE-2013-5588 - XSS issue via installer or device editing CVE-2013-5589 - SQL injection vulnerability in device editing CVE-2014-2326 - XSS issue via CDEF editing CVE-2014-2327 - Cross-site request forgery (CSRF) vulnerability CVE-2014-2328 - Remote Command Execution Vulnerability in graph export CVE-2014-4002 - XSS issues in multiple files CVE-2014-5025 - XSS issue via data source editing CVE-2014-5026 - XSS issues in multiple files Important Updates New graph tree view Updated graph list and graph preview Refactor graph tree view to remove GPL incompatible code Updated command line database upgrade utility Graph zooming now from everywhere
35 lines
1.9 KiB
PHP
35 lines
1.9 KiB
PHP
$NetBSD: patch-install_index.php,v 1.3 2015/03/11 13:56:46 adam Exp $
|
|
|
|
- Find utilites in PREFIX first.
|
|
- Fix-up hard coded user and path (documentaion only).
|
|
- Make log directory configurable by package variable
|
|
|
|
--- install/index.php.orig 2014-11-23 20:18:57.000000000 +0000
|
|
+++ install/index.php
|
|
@@ -96,7 +96,7 @@ function find_best_path($binary_name) {
|
|
if ($config["cacti_server_os"] == "win32") {
|
|
$search_paths = array("c:/usr/bin", "c:/cacti", "c:/rrdtool", "c:/spine", "c:/php", "c:/progra~1/php", "c:/net-snmp/bin", "c:/progra~1/net-snmp/bin", "d:/usr/bin", "d:/net-snmp/bin", "d:/progra~1/net-snmp/bin", "d:/cacti", "d:/rrdtool", "d:/spine", "d:/php", "d:/progra~1/php");
|
|
}else{
|
|
- $search_paths = array("/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin", "/usr/local/sbin");
|
|
+ $search_paths = array("@PREFIX@/bin", "@PREFIX@/sbin", "/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/local/bin", "/usr/local/sbin");
|
|
}
|
|
|
|
for ($i=0; $i<count($search_paths); $i++) {
|
|
@@ -267,7 +267,7 @@ $input["path_cactilog"]["description"] =
|
|
if (config_value_exists("path_cactilog")) {
|
|
$input["path_cactilog"]["default"] = read_config_option("path_cactilog");
|
|
} else {
|
|
- $input["path_cactilog"]["default"] = $config["base_path"] . "/log/cacti.log";
|
|
+ $input["path_cactilog"]["default"] = "@CACTI_LOGDIR@" . "/cacti.log";
|
|
}
|
|
|
|
/* SNMP Version */
|
|
@@ -670,7 +670,7 @@ if ($step == "4") {
|
|
|
|
<p>See the sample crontab entry below with the change made in red. Your crontab line will look slightly different based upon your setup.</p>
|
|
|
|
- <p><tt>*/5 * * * * cactiuser php /var/www/html/cacti/<span style='font-weight: bold; color: red;'>poller.php</span> > /dev/null 2>&1</tt></p>
|
|
+ <p><tt>*/5 * * * * @CACTI_USER@ php @CACTIDIR@<span style='font-weight: bold; color: red;'>poller.php</span> > /dev/null 2>&1</tt></p>
|
|
|
|
<p>Once you have made this change, please click Next to continue.</p>
|
|
|