1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
$NetBSD: patch-install_functions.php,v 1.3 2020/04/21 13:55:22 mef Exp $
Find utilites in PREFIX first.
Make log directory configurable by package variable
--- install/functions.php.orig 2020-04-06 11:14:20.000000000 +0900
+++ install/functions.php 2020-04-21 22:46:24.419734842 +0900
@@ -374,8 +374,8 @@ function find_search_paths($os = 'unix')
$search_suffix = ':';
$search_slash = '';
$search_paths = array(
- '/bin',
- '/sbin',
+ '@PREFIX@/bin',
+ '@PREFIX@/sbin',
'/usr/bin',
'/usr/sbin',
'/usr/local/bin',
@@ -475,42 +475,42 @@ function install_file_paths() {
/* RRDtool Binary Path */
$input['path_rrdtool'] = install_tool_path('rrdtool',
array(
- 'unix' => '/usr/local/bin/rrdtool',
+ 'unix' => '@PREFIX@/bin/rrdtool',
'win32' => 'c:/rrdtool/rrdtool.exe'
));
/* snmpwalk Binary Path */
$input['path_snmpwalk'] = install_tool_path('snmpwalk',
array(
- 'unix' => '/usr/local/bin/snmpwalk',
+ 'unix' => '@PREFIX@/bin/snmpwalk',
'win32' => 'c:/net-snmp/bin/snmpwalk.exe'
));
/* snmpget Binary Path */
$input['path_snmpget'] = install_tool_path('snmpget',
array(
- 'unix' => '/usr/local/bin/snmpget',
+ 'unix' => '@PREFIX@/bin/snmpget',
'win32' => 'c:/net-snmp/bin/snmpget.exe'
));
/* snmpbulkwalk Binary Path */
$input['path_snmpbulkwalk'] = install_tool_path('snmpbulkwalk',
array(
- 'unix' => '/usr/local/bin/snmpbulkwalk',
+ 'unix' => '@PREFIX@/bin/snmpbulkwalk',
'win32' => 'c:/net-snmp/bin/snmpbulkwalk.exe'
));
/* snmpgetnext Binary Path */
$input['path_snmpgetnext'] = install_tool_path('snmpgetnext',
array(
- 'unix' => '/usr/local/bin/snmpgetnext',
+ 'unix' => '@PREFIX@/bin/snmpgetnext',
'win32' => 'c:/net-snmp/bin/snmpgetnext.exe'
));
/* snmptrap Binary Path */
$input['path_snmptrap'] = install_tool_path('snmptrap',
array(
- 'unix' => '/usr/local/bin/snmptrap',
+ 'unix' => '@PREFIX@/bin/snmptrap',
'win32' => 'c:/net-snmp/bin/snmptrap.exe'
));
@@ -523,7 +523,7 @@ function install_file_paths() {
/* spine Binary Path */
$input['path_spine'] = install_tool_path('spine',
array(
- 'unix' => '/usr/local/spine/bin/spine',
+ 'unix' => '@PREFIX@/bin/spine',
'win32' => 'c:/spine/bin/spine.exe'
));
@@ -538,14 +538,14 @@ function install_file_paths() {
}
if (empty($input['path_cactilog']['default'])) {
- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
+ $input['path_cactilog']['default'] = '@CACTI_LOGDIR@' . '/log/cacti.log';
}
/* stderr log file path */
if (!config_value_exists('path_cactilog')) {
$input['path_stderrlog'] = $settings['path']['path_stderrlog'];
if (empty($input['path_stderrlog']['default'])) {
- $input['path_stderrlog']['default'] = $config['base_path'] . '/log/cacti.stderr.log';
+ $input['path_stderrlog']['default'] = '@CACTI_LOGDIR@' . '/cacti.stderr.log';
}
} else {
$input['path_stderrlog'] = $settings['path']['path_stderrlog'];
@@ -802,7 +802,7 @@ function log_install_to_file($section, $
$section = 'general';
}
$logfile = 'install' . '-' . $section;
- file_put_contents($config['base_path'] . '/log/' . $logfile . '.log', sprintf($format_log1, $day, $time, $levelname, $data, PHP_EOL), $flags);
- file_put_contents($config['base_path'] . '/log/install-complete.log', sprintf($format_log2, $day, $time, $sectionname, $levelname, $data, PHP_EOL), $flags);
+ file_put_contents('@CACTI_LOGDIR@' . '/' . $logfile . '.log', sprintf($format_log1, $day, $time, $levelname, $data, PHP_EOL), $flags);
+ file_put_contents('@CACTI_LOGDIR@' . '/install-complete.log', sprintf($format_log2, $day, $time, $sectionname, $levelname, $data, PHP_EOL), $flags);
}
}
|
