View | Details | Raw Unified | Return to bug 242834
Collapse All | Expand All

(-)cacti128/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# $FreeBSD: head/net-mgmt/cacti/Makefile 513582 2019-10-02 14:53:51Z kai $
1
# $FreeBSD: head/net-mgmt/cacti/Makefile 513582 2019-10-02 14:53:51Z kai $
2
2
3
PORTNAME=	cacti
3
PORTNAME=	cacti
4
PORTVERSION=	1.2.7
4
PORTVERSION=	1.2.8
5
CATEGORIES=	net-mgmt www
5
CATEGORIES=	net-mgmt www
6
MASTER_SITES=	http://www.cacti.net/downloads/ \
6
MASTER_SITES=	http://www.cacti.net/downloads/ \
7
		ftp://ftpmirror.uk/freebsd-ports/cacti/
7
		ftp://ftpmirror.uk/freebsd-ports/cacti/
(-)cacti128/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1569956243
1
TIMESTAMP = 1577112723
2
SHA256 (cacti-1.2.7.tar.gz) = 45b4d57964aa2e11176f03f866be9c4e5850eaa5abe83137b61b3fe9d7ddce34
2
SHA256 (cacti-1.2.8.tar.gz) = ca4b83d1963a358c9ab60276becc46553fa0125d1ad906c2d26278a485615a29
3
SIZE (cacti-1.2.7.tar.gz) = 24819135
3
SIZE (cacti-1.2.8.tar.gz) = 24881361
(-)cacti128/files/patch-include__global.php (-11 lines)
Lines 1-11 Link Here
1
--- include/global.php.orig	2019-03-30 23:40:22 UTC
2
+++ include/global.php
3
@@ -216,7 +216,7 @@ if ($config['cacti_server_os'] == 'win32') {
4
 	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
5
 }
6
 $config['include_path'] = dirname(__FILE__);
7
-$config['rra_path'] = $config['base_path'] . '/rra';
8
+$config['rra_path'] = '/var/db/cacti/rra';
9
 
10
 /* for multiple pollers, we need to know this location */
11
 if (!isset($scripts_path)) {
(-)cacti128/files/patch-include__global_settings.php (-15 lines)
Lines 1-15 Link Here
1
--- include/global_settings.php.orig	2019-01-03 02:14:26 UTC
2
+++ include/global_settings.php
3
@@ -160,10 +160,10 @@ $settings = array(
4
 			),
5
 		'path_cactilog' => array(
6
 			'friendly_name' => __('Cacti Log Path'),
7
-			'description' => __('The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)'),
8
+			'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),
9
 			'method' => 'filepath',
10
 			'file_type' => 'ascii',
11
-			'default' => $config['base_path'] . '/log/cacti.log',
12
+			'default' => '/var/log/cacti/log',
13
 			'max_length' => '255',
14
 			'install_check' => 'writable'
15
 			),
(-)cacti128/files/patch-include_global.php (+11 lines)
Line 0 Link Here
1
--- include/global.php.orig	2019-12-23 14:55:38 UTC
2
+++ include/global.php
3
@@ -225,7 +225,7 @@ if ($config['cacti_server_os'] == 'win32') {
4
 	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
5
 }
6
 $config['include_path'] = dirname(__FILE__);
7
-$config['rra_path'] = $config['base_path'] . '/rra';
8
+$config['rra_path'] = '/var/db/cacti/rra';
9
 
10
 /* for multiple pollers, we need to know this location */
11
 if (!isset($scripts_path)) {
(-)cacti128/files/patch-include_global__settings.php (+15 lines)
Line 0 Link Here
1
--- include/global_settings.php.orig	2019-12-23 14:55:24 UTC
2
+++ include/global_settings.php
3
@@ -160,10 +160,10 @@ $settings = array(
4
 			),
5
 		'path_cactilog' => array(
6
 			'friendly_name' => __('Cacti Log Path'),
7
-			'description' => __('The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)'),
8
+			'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),
9
 			'method' => 'filepath',
10
 			'file_type' => 'ascii',
11
-			'default' => $config['base_path'] . '/log/cacti.log',
12
+			'default' => '/var/log/cacti/log',
13
 			'max_length' => '255',
14
 			'install_check' => 'writable',
15
 			'install_blank' => true
(-)cacti128/files/patch-install__functions.php (-11 lines)
Lines 1-11 Link Here
1
--- install/functions.php.orig	2019-07-15 19:23:30 UTC
2
+++ install/functions.php
3
@@ -538,7 +538,7 @@ function install_file_paths() {
4
 	}
5
 
6
 	if (empty($input['path_cactilog']['default'])) {
7
-		$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
8
+		$input['path_cactilog']['default'] = '/var/log/cacti/log';
9
 	}
10
 
11
 	/* stderr log file path */
(-)cacti128/files/patch-install_functions.php (+11 lines)
Line 0 Link Here
1
--- install/functions.php.orig	2019-12-23 14:55:09 UTC
2
+++ install/functions.php
3
@@ -544,7 +544,7 @@ function install_file_paths() {
4
 	}
5
 
6
 	if (empty($input['path_cactilog']['default'])) {
7
-		$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
8
+		$input['path_cactilog']['default'] = '/var/log/cacti/log';
9
 	}
10
 
11
 	/* stderr log file path */
(-)cacti128/files/patch-lib__clog_webapi.php (-11 lines)
Lines 1-11 Link Here
1
--- lib/clog_webapi.php.orig	2019-01-03 02:14:26 UTC
2
+++ lib/clog_webapi.php
3
@@ -56,7 +56,7 @@ function clog_validate_filename(&$file, &$filepath, &$
4
 	$logbase = basename($logfile);
5
 
6
 	if ($logfile == '') {
7
-		$logfile = $config['base_path'] . '/log/cacti.log';
8
+		$logfile = '/var/log/cacti/log';
9
 	}
10
 
11
 	$errfile = read_config_option('path_stderrlog');
(-)cacti128/files/patch-lib__functions.php (-11 lines)
Lines 1-11 Link Here
1
--- lib/functions.php.orig	2019-01-03 02:14:26 UTC
2
+++ lib/functions.php
3
@@ -818,7 +818,7 @@ function cacti_log_file() {
4
 	global $config;
5
 	$logfile        = read_config_option('path_cactilog');
6
 	if ($logfile == '') {
7
-		$logfile = $config['base_path'] . '/log/cacti.log';
8
+		$logfile = '/var/log/cacti/log';
9
 	}
10
 	$config['log_path'] = $logfile;
11
 	return $logfile;
(-)cacti128/files/patch-lib_clog__webapi.php (+11 lines)
Line 0 Link Here
1
--- lib/clog_webapi.php.orig	2019-12-23 14:54:55 UTC
2
+++ lib/clog_webapi.php
3
@@ -58,7 +58,7 @@ function clog_validate_filename(&$file, &$filepath, &$
4
 	$logbase = basename($logfile);
5
 
6
 	if ($logfile == '') {
7
-		$logfile = $config['base_path'] . '/log/cacti.log';
8
+		$logfile = '/var/log/cacti/log';
9
 	}
10
 
11
 	$errfile = read_config_option('path_stderrlog');
(-)cacti128/files/patch-lib_functions.php (+11 lines)
Line 0 Link Here
1
--- lib/functions.php.orig	2019-12-23 14:54:42 UTC
2
+++ lib/functions.php
3
@@ -854,7 +854,7 @@ function cacti_log_file() {
4
 	global $config;
5
 	$logfile        = read_config_option('path_cactilog');
6
 	if ($logfile == '') {
7
-		$logfile = $config['base_path'] . '/log/cacti.log';
8
+		$logfile = '/var/log/cacti/log';
9
 	}
10
 	$config['log_path'] = $logfile;
11
 	return $logfile;
(-)cacti128/files/patch-lib_installer.php (-2 / +2 lines)
Lines 1-6 Link Here
1
--- lib/installer.php.orig	2019-09-29 18:36:29 UTC
1
--- lib/installer.php.orig	2019-12-23 14:54:27 UTC
2
+++ lib/installer.php
2
+++ lib/installer.php
3
@@ -3226,7 +3226,7 @@ class Installer implements JsonSerializable {
3
@@ -3252,7 +3252,7 @@ class Installer implements JsonSerializable {
4
 		global $config;
4
 		global $config;
5
 
5
 
6
 		$page_nr = 1;
6
 		$page_nr = 1;
(-)cacti128/files/patch-poller__maintenance.php (+11 lines)
Line 0 Link Here
1
--- poller_maintenance.php.orig	2019-12-23 14:54:13 UTC
2
+++ poller_maintenance.php
3
@@ -227,7 +227,7 @@ function logrotate_rotatenow() {
4
 	$logs = array();
5
 	$log = read_config_option('path_cactilog');
6
 	if (empty($log)) {
7
-		$log = $config['base_path'] . '/log/cacti.log';
8
+		$log = '/var/log/cacti/log';
9
 	}
10
 	$logs['Cacti'] = $log;
11
 
(-)cacti128/files/patch-poller_maintenance.php (-11 lines)
Lines 1-11 Link Here
1
--- poller_maintenance.php.orig	2019-01-03 02:14:26 UTC
2
+++ poller_maintenance.php
3
@@ -227,7 +227,7 @@ function logrotate_rotatenow() {
4
 	$logs = array();
5
 	$log = read_config_option('path_cactilog');
6
 	if (empty($log)) {
7
-		$log = $config['base_path'] . '/log/cacti.log';
8
+		$log = '/var/log/cacti/log';
9
 	}
10
 	$logs['Cacti'] = $log;
11
 
(-)cacti128/files/patch-utilities.php (-4 / +4 lines)
Lines 1-6 Link Here
1
--- utilities.php.orig	2017-08-13 04:06:37 UTC
1
--- utilities.php.orig	2019-12-23 14:54:02 UTC
2
+++ utilities.php
2
+++ utilities.php
3
@@ -877,7 +877,7 @@ function utilities_view_logfile() {
3
@@ -920,7 +920,7 @@ function utilities_view_logfile() {
4
 	}
4
 	}
5
 
5
 
6
 	if ($logfile == '') {
6
 	if ($logfile == '') {
Lines 8-15 Link Here
8
+		$logfile = '/var/log/cacti/log';
8
+		$logfile = '/var/log/cacti/log';
9
 	}
9
 	}
10
 
10
 
11
 	/* ================= input validation and session storage ================= */
11
 	if (get_nfilter_request_var('filename') != '') {
12
@@ -1199,7 +1199,7 @@ function utilities_clear_logfile() {
12
@@ -1246,7 +1246,7 @@ function utilities_clear_logfile() {
13
 	$logfile = read_config_option('path_cactilog');
13
 	$logfile = read_config_option('path_cactilog');
14
 
14
 
15
 	if ($logfile == '') {
15
 	if ($logfile == '') {
(-)cacti128/pkg-plist (-59 / +62 lines)
Lines 24-33 Link Here
24
%%CACTIDIR%%/cache/realtime/index.php
24
%%CACTIDIR%%/cache/realtime/index.php
25
%%CACTIDIR%%/cache/spikekill/.htaccess
25
%%CACTIDIR%%/cache/spikekill/.htaccess
26
%%CACTIDIR%%/cache/spikekill/index.php
26
%%CACTIDIR%%/cache/spikekill/index.php
27
%%CACTIDIR%%/cacti.sql
27
%%CACTIDIR%%/%%CACTIUSER%%.sql
28
%%CACTIDIR%%/cdef.php
28
%%CACTIDIR%%/cdef.php
29
%%CACTIDIR%%/cli/.htaccess
29
%%CACTIDIR%%/cli/.htaccess
30
%%CACTIDIR%%/cli/index.php
31
%%CACTIDIR%%/cli/add_data_query.php
30
%%CACTIDIR%%/cli/add_data_query.php
32
%%CACTIDIR%%/cli/add_datasource.php
31
%%CACTIDIR%%/cli/add_datasource.php
33
%%CACTIDIR%%/cli/add_device.php
32
%%CACTIDIR%%/cli/add_device.php
Lines 42-51 Link Here
42
%%CACTIDIR%%/cli/copy_user.php
41
%%CACTIDIR%%/cli/copy_user.php
43
%%CACTIDIR%%/cli/host_update_template.php
42
%%CACTIDIR%%/cli/host_update_template.php
44
%%CACTIDIR%%/cli/import_package.php
43
%%CACTIDIR%%/cli/import_package.php
44
%%CACTIDIR%%/cli/import_template.php
45
%%CACTIDIR%%/cli/index.php
45
%%CACTIDIR%%/cli/input_whitelist.php
46
%%CACTIDIR%%/cli/input_whitelist.php
46
%%CACTIDIR%%/cli/install_cacti.php
47
%%CACTIDIR%%/cli/install_%%CACTIUSER%%.php
47
%%CACTIDIR%%/cli/md5sum.php
48
%%CACTIDIR%%/cli/md5sum.php
48
%%CACTIDIR%%/cli/import_template.php
49
%%CACTIDIR%%/cli/poller_data_sources_reapply_names.php
49
%%CACTIDIR%%/cli/poller_data_sources_reapply_names.php
50
%%CACTIDIR%%/cli/poller_graphs_reapply_names.php
50
%%CACTIDIR%%/cli/poller_graphs_reapply_names.php
51
%%CACTIDIR%%/cli/poller_output_empty.php
51
%%CACTIDIR%%/cli/poller_output_empty.php
Lines 73-80 Link Here
73
%%CACTIDIR%%/data_debug.php
73
%%CACTIDIR%%/data_debug.php
74
%%CACTIDIR%%/data_input.php
74
%%CACTIDIR%%/data_input.php
75
%%CACTIDIR%%/data_queries.php
75
%%CACTIDIR%%/data_queries.php
76
%%CACTIDIR%%/data_sources.php
77
%%CACTIDIR%%/data_source_profiles.php
76
%%CACTIDIR%%/data_source_profiles.php
77
%%CACTIDIR%%/data_sources.php
78
%%CACTIDIR%%/data_templates.php
78
%%CACTIDIR%%/data_templates.php
79
%%CACTIDIR%%/docs/Aggregate-Templates.html
79
%%CACTIDIR%%/docs/Aggregate-Templates.html
80
%%CACTIDIR%%/docs/Aggregates.html
80
%%CACTIDIR%%/docs/Aggregates.html
Lines 111-116 Link Here
111
%%CACTIDIR%%/docs/How-To-Data-Query-Templates.html
111
%%CACTIDIR%%/docs/How-To-Data-Query-Templates.html
112
%%CACTIDIR%%/docs/How-To-Determine-Template-Version.html
112
%%CACTIDIR%%/docs/How-To-Determine-Template-Version.html
113
%%CACTIDIR%%/docs/How-To-SSH-Tunnels.html
113
%%CACTIDIR%%/docs/How-To-SSH-Tunnels.html
114
%%CACTIDIR%%/docs/How-To-Setup-Remote-Pollers.html
114
%%CACTIDIR%%/docs/How-to-Graph-Your-Network.html
115
%%CACTIDIR%%/docs/How-to-Graph-Your-Network.html
115
%%CACTIDIR%%/docs/How-to-Graph-a-Custom-Collection-Script.html
116
%%CACTIDIR%%/docs/How-to-Graph-a-Custom-Collection-Script.html
116
%%CACTIDIR%%/docs/Import-Template.html
117
%%CACTIDIR%%/docs/Import-Template.html
Lines 128-133 Link Here
128
%%CACTIDIR%%/docs/Plugins.html
129
%%CACTIDIR%%/docs/Plugins.html
129
%%CACTIDIR%%/docs/Principles-of-Operation.html
130
%%CACTIDIR%%/docs/Principles-of-Operation.html
130
%%CACTIDIR%%/docs/RRDTool-Specific-Features.html
131
%%CACTIDIR%%/docs/RRDTool-Specific-Features.html
132
%%CACTIDIR%%/docs/RRDproxy.html
131
%%CACTIDIR%%/docs/Requirements.html
133
%%CACTIDIR%%/docs/Requirements.html
132
%%CACTIDIR%%/docs/SNMP-Data-Queries-Walkthrough.html
134
%%CACTIDIR%%/docs/SNMP-Data-Queries-Walkthrough.html
133
%%CACTIDIR%%/docs/SNMP-New-Data-Query-Walkthrough.html
135
%%CACTIDIR%%/docs/SNMP-New-Data-Query-Walkthrough.html
Lines 192-213 Link Here
192
%%CACTIDIR%%/docs/images/automation-tree-rules-edit3.png
194
%%CACTIDIR%%/docs/images/automation-tree-rules-edit3.png
193
%%CACTIDIR%%/docs/images/automation-tree-rules-edit4.png
195
%%CACTIDIR%%/docs/images/automation-tree-rules-edit4.png
194
%%CACTIDIR%%/docs/images/automation-tree-rules.png
196
%%CACTIDIR%%/docs/images/automation-tree-rules.png
195
%%CACTIDIR%%/docs/images/cacti-page-layout.png
197
%%CACTIDIR%%/docs/images/%%CACTIUSER%%-page-layout.png
196
%%CACTIDIR%%/docs/images/cacti-tree-view-page.png
198
%%CACTIDIR%%/docs/images/%%CACTIUSER%%-tree-view-page.png
197
%%CACTIDIR%%/docs/images/cacti_add_device_site.JPG
199
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_add_device_site.JPG
198
%%CACTIDIR%%/docs/images/cacti_add_sites.JPG
200
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_add_sites.JPG
199
%%CACTIDIR%%/docs/images/cacti_default_tree.png
201
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_default_tree.png
200
%%CACTIDIR%%/docs/images/cacti_device_datasource.JPG
202
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_device_datasource.JPG
201
%%CACTIDIR%%/docs/images/cacti_graph_managment.JPG
203
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_managment.JPG
202
%%CACTIDIR%%/docs/images/cacti_graph_managment_graph.JPG
204
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_managment_graph.JPG
203
%%CACTIDIR%%/docs/images/cacti_graph_template_options.JPG
205
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_template_options.JPG
204
%%CACTIDIR%%/docs/images/cacti_remote_poller_setup.JPG
206
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_remote_poller_setup.JPG
205
%%CACTIDIR%%/docs/images/cacti_sites_automation.JPG
207
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_sites_automation.JPG
206
%%CACTIDIR%%/docs/images/cacti_sites_page.png
208
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_sites_page.png
207
%%CACTIDIR%%/docs/images/cacti_system_utilities.JPG
209
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_system_utilities.JPG
208
%%CACTIDIR%%/docs/images/cacti_thold_enable.JPG
210
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_thold_enable.JPG
209
%%CACTIDIR%%/docs/images/cacti_thold_plugin_install.JPG
211
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_thold_plugin_install.JPG
210
%%CACTIDIR%%/docs/images/cacti_trees_screen.png
212
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_trees_screen.png
211
%%CACTIDIR%%/docs/images/cdef-01.preview.png
213
%%CACTIDIR%%/docs/images/cdef-01.preview.png
212
%%CACTIDIR%%/docs/images/cdefs-edit1.png
214
%%CACTIDIR%%/docs/images/cdefs-edit1.png
213
%%CACTIDIR%%/docs/images/cdefs-edit2.png
215
%%CACTIDIR%%/docs/images/cdefs-edit2.png
Lines 478-486 Link Here
478
%%CACTIDIR%%/docs/images/vdefs-edit4.png
480
%%CACTIDIR%%/docs/images/vdefs-edit4.png
479
%%CACTIDIR%%/docs/images/vdefs.png
481
%%CACTIDIR%%/docs/images/vdefs.png
480
%%CACTIDIR%%/docs/index.php
482
%%CACTIDIR%%/docs/index.php
481
%%CACTIDIR%%/formats/cacti_group.format
483
%%CACTIDIR%%/formats/%%CACTIUSER%%_group.format
482
%%CACTIDIR%%/formats/cacti_group_dark.format
484
%%CACTIDIR%%/formats/%%CACTIUSER%%_group_dark.format
483
%%CACTIDIR%%/formats/cacti_monitor.format
485
%%CACTIDIR%%/formats/%%CACTIUSER%%_monitor.format
484
%%CACTIDIR%%/formats/default.format
486
%%CACTIDIR%%/formats/default.format
485
%%CACTIDIR%%/formats/index.php
487
%%CACTIDIR%%/formats/index.php
486
%%CACTIDIR%%/formats/lotus_notes.format
488
%%CACTIDIR%%/formats/lotus_notes.format
Lines 505-517 Link Here
505
%%CACTIDIR%%/images/auth_background.gif
507
%%CACTIDIR%%/images/auth_background.gif
506
%%CACTIDIR%%/images/bullet_arrow_down.png
508
%%CACTIDIR%%/images/bullet_arrow_down.png
507
%%CACTIDIR%%/images/bullet_arrow_up.png
509
%%CACTIDIR%%/images/bullet_arrow_up.png
508
%%CACTIDIR%%/images/cacti_about_logo.gif
510
%%CACTIDIR%%/images/%%CACTIUSER%%_about_logo.gif
509
%%CACTIDIR%%/images/cacti_backdrop.gif
511
%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop.gif
510
%%CACTIDIR%%/images/cacti_backdrop2.gif
512
%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop2.gif
511
%%CACTIDIR%%/images/cacti_error_image.png
513
%%CACTIDIR%%/images/%%CACTIUSER%%_error_image.png
512
%%CACTIDIR%%/images/cacti_logo.gif
514
%%CACTIDIR%%/images/%%CACTIUSER%%_logo.gif
513
%%CACTIDIR%%/images/cacti_logo_new.gif
515
%%CACTIDIR%%/images/%%CACTIUSER%%_logo.svg
514
%%CACTIDIR%%/images/cacti_logo.svg
516
%%CACTIDIR%%/images/%%CACTIUSER%%_logo_new.gif
515
%%CACTIDIR%%/images/calendar.gif
517
%%CACTIDIR%%/images/calendar.gif
516
%%CACTIDIR%%/images/chart_curve_go.png
518
%%CACTIDIR%%/images/chart_curve_go.png
517
%%CACTIDIR%%/images/cog.png
519
%%CACTIDIR%%/images/cog.png
Lines 553-559 Link Here
553
%%CACTIDIR%%/images/site.png
555
%%CACTIDIR%%/images/site.png
554
%%CACTIDIR%%/images/spikekill.gif
556
%%CACTIDIR%%/images/spikekill.gif
555
%%CACTIDIR%%/images/stop.png
557
%%CACTIDIR%%/images/stop.png
556
%%CACTIDIR%%/images/tab_cacti.gif
558
%%CACTIDIR%%/images/tab_%%CACTIUSER%%.gif
557
%%CACTIDIR%%/images/tab_clog.png
559
%%CACTIDIR%%/images/tab_clog.png
558
%%CACTIDIR%%/images/tab_clog_down.png
560
%%CACTIDIR%%/images/tab_clog_down.png
559
%%CACTIDIR%%/images/tab_console.gif
561
%%CACTIDIR%%/images/tab_console.gif
Lines 586-592 Link Here
586
%%CACTIDIR%%/images/view_page.png
588
%%CACTIDIR%%/images/view_page.png
587
%%CACTIDIR%%/include/auth.php
589
%%CACTIDIR%%/include/auth.php
588
%%CACTIDIR%%/include/bottom_footer.php
590
%%CACTIDIR%%/include/bottom_footer.php
589
%%CACTIDIR%%/include/cacti_version
591
%%CACTIDIR%%/include/%%CACTIUSER%%_version
590
%%CACTIDIR%%/include/cli_check.php
592
%%CACTIDIR%%/include/cli_check.php
591
%%CACTIDIR%%/include/config.php.sample
593
%%CACTIDIR%%/include/config.php.sample
592
%%CACTIDIR%%/include/content/README
594
%%CACTIDIR%%/include/content/README
Lines 782-787 Link Here
782
%%CACTIDIR%%/include/js/d3.js
784
%%CACTIDIR%%/include/js/d3.js
783
%%CACTIDIR%%/include/js/dygraph-combined.js
785
%%CACTIDIR%%/include/js/dygraph-combined.js
784
%%CACTIDIR%%/include/js/index.php
786
%%CACTIDIR%%/include/js/index.php
787
%%CACTIDIR%%/include/js/jquery-ui.js
785
%%CACTIDIR%%/include/js/jquery.colorpicker.js
788
%%CACTIDIR%%/include/js/jquery.colorpicker.js
786
%%CACTIDIR%%/include/js/jquery.cookie.js
789
%%CACTIDIR%%/include/js/jquery.cookie.js
787
%%CACTIDIR%%/include/js/jquery.dropdown.js
790
%%CACTIDIR%%/include/js/jquery.dropdown.js
Lines 798-804 Link Here
798
%%CACTIDIR%%/include/js/jquery.timepicker.js
801
%%CACTIDIR%%/include/js/jquery.timepicker.js
799
%%CACTIDIR%%/include/js/jquery.ui.touch.punch.js
802
%%CACTIDIR%%/include/js/jquery.ui.touch.punch.js
800
%%CACTIDIR%%/include/js/jquery.zoom.js
803
%%CACTIDIR%%/include/js/jquery.zoom.js
801
%%CACTIDIR%%/include/js/jquery-ui.js
802
%%CACTIDIR%%/include/js/js.storage.js
804
%%CACTIDIR%%/include/js/js.storage.js
803
%%CACTIDIR%%/include/js/jstree.js
805
%%CACTIDIR%%/include/js/jstree.js
804
%%CACTIDIR%%/include/js/pace.js
806
%%CACTIDIR%%/include/js/pace.js
Lines 821-828 Link Here
821
%%CACTIDIR%%/include/themes/classic/images/bar-opacity.png
823
%%CACTIDIR%%/include/themes/classic/images/bar-opacity.png
822
%%CACTIDIR%%/include/themes/classic/images/bar-pointer.png
824
%%CACTIDIR%%/include/themes/classic/images/bar-pointer.png
823
%%CACTIDIR%%/include/themes/classic/images/bar.png
825
%%CACTIDIR%%/include/themes/classic/images/bar.png
824
%%CACTIDIR%%/include/themes/classic/images/cacti_logo.gif
826
%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.gif
825
%%CACTIDIR%%/include/themes/classic/images/cacti_logo.svg
827
%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.svg
826
%%CACTIDIR%%/include/themes/classic/images/favicon.ico
828
%%CACTIDIR%%/include/themes/classic/images/favicon.ico
827
%%CACTIDIR%%/include/themes/classic/images/favicon.png
829
%%CACTIDIR%%/include/themes/classic/images/favicon.png
828
%%CACTIDIR%%/include/themes/classic/images/index.php
830
%%CACTIDIR%%/include/themes/classic/images/index.php
Lines 871-880 Link Here
871
%%CACTIDIR%%/include/themes/dark/images/bar-opacity.png
873
%%CACTIDIR%%/include/themes/dark/images/bar-opacity.png
872
%%CACTIDIR%%/include/themes/dark/images/bar-pointer.png
874
%%CACTIDIR%%/include/themes/dark/images/bar-pointer.png
873
%%CACTIDIR%%/include/themes/dark/images/bar.png
875
%%CACTIDIR%%/include/themes/dark/images/bar.png
874
%%CACTIDIR%%/include/themes/dark/images/cacti_backdrop.gif
876
%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop.gif
875
%%CACTIDIR%%/include/themes/dark/images/cacti_backdrop2.gif
877
%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop2.gif
876
%%CACTIDIR%%/include/themes/dark/images/cacti_logo.gif
878
%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.gif
877
%%CACTIDIR%%/include/themes/dark/images/cacti_logo.svg
879
%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.svg
878
%%CACTIDIR%%/include/themes/dark/images/favicon.ico
880
%%CACTIDIR%%/include/themes/dark/images/favicon.ico
879
%%CACTIDIR%%/include/themes/dark/images/favicon.png
881
%%CACTIDIR%%/include/themes/dark/images/favicon.png
880
%%CACTIDIR%%/include/themes/dark/images/index.php
882
%%CACTIDIR%%/include/themes/dark/images/index.php
Lines 926-933 Link Here
926
%%CACTIDIR%%/include/themes/modern/images/bar-opacity.png
928
%%CACTIDIR%%/include/themes/modern/images/bar-opacity.png
927
%%CACTIDIR%%/include/themes/modern/images/bar-pointer.png
929
%%CACTIDIR%%/include/themes/modern/images/bar-pointer.png
928
%%CACTIDIR%%/include/themes/modern/images/bar.png
930
%%CACTIDIR%%/include/themes/modern/images/bar.png
929
%%CACTIDIR%%/include/themes/modern/images/cacti_logo.gif
931
%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.gif
930
%%CACTIDIR%%/include/themes/modern/images/cacti_logo.svg
932
%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.svg
931
%%CACTIDIR%%/include/themes/modern/images/favicon.ico
933
%%CACTIDIR%%/include/themes/modern/images/favicon.ico
932
%%CACTIDIR%%/include/themes/modern/images/favicon.png
934
%%CACTIDIR%%/include/themes/modern/images/favicon.png
933
%%CACTIDIR%%/include/themes/modern/images/index.php
935
%%CACTIDIR%%/include/themes/modern/images/index.php
Lines 977-984 Link Here
977
%%CACTIDIR%%/include/themes/paper-plane/images/bar-opacity.png
979
%%CACTIDIR%%/include/themes/paper-plane/images/bar-opacity.png
978
%%CACTIDIR%%/include/themes/paper-plane/images/bar-pointer.png
980
%%CACTIDIR%%/include/themes/paper-plane/images/bar-pointer.png
979
%%CACTIDIR%%/include/themes/paper-plane/images/bar.png
981
%%CACTIDIR%%/include/themes/paper-plane/images/bar.png
980
%%CACTIDIR%%/include/themes/paper-plane/images/cacti_logo.gif
982
%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.gif
981
%%CACTIDIR%%/include/themes/paper-plane/images/cacti_logo.svg
983
%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.svg
982
%%CACTIDIR%%/include/themes/paper-plane/images/favicon.ico
984
%%CACTIDIR%%/include/themes/paper-plane/images/favicon.ico
983
%%CACTIDIR%%/include/themes/paper-plane/images/favicon.png
985
%%CACTIDIR%%/include/themes/paper-plane/images/favicon.png
984
%%CACTIDIR%%/include/themes/paper-plane/images/index.php
986
%%CACTIDIR%%/include/themes/paper-plane/images/index.php
Lines 1028-1035 Link Here
1028
%%CACTIDIR%%/include/themes/paw/images/bar-opacity.png
1030
%%CACTIDIR%%/include/themes/paw/images/bar-opacity.png
1029
%%CACTIDIR%%/include/themes/paw/images/bar-pointer.png
1031
%%CACTIDIR%%/include/themes/paw/images/bar-pointer.png
1030
%%CACTIDIR%%/include/themes/paw/images/bar.png
1032
%%CACTIDIR%%/include/themes/paw/images/bar.png
1031
%%CACTIDIR%%/include/themes/paw/images/cacti_logo.gif
1033
%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.gif
1032
%%CACTIDIR%%/include/themes/paw/images/cacti_logo.svg
1034
%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.svg
1033
%%CACTIDIR%%/include/themes/paw/images/favicon.ico
1035
%%CACTIDIR%%/include/themes/paw/images/favicon.ico
1034
%%CACTIDIR%%/include/themes/paw/images/favicon.png
1036
%%CACTIDIR%%/include/themes/paw/images/favicon.png
1035
%%CACTIDIR%%/include/themes/paw/images/index.php
1037
%%CACTIDIR%%/include/themes/paw/images/index.php
Lines 1079-1086 Link Here
1079
%%CACTIDIR%%/include/themes/sunrise/images/bar-opacity.png
1081
%%CACTIDIR%%/include/themes/sunrise/images/bar-opacity.png
1080
%%CACTIDIR%%/include/themes/sunrise/images/bar-pointer.png
1082
%%CACTIDIR%%/include/themes/sunrise/images/bar-pointer.png
1081
%%CACTIDIR%%/include/themes/sunrise/images/bar.png
1083
%%CACTIDIR%%/include/themes/sunrise/images/bar.png
1082
%%CACTIDIR%%/include/themes/sunrise/images/cacti_logo.gif
1084
%%CACTIDIR%%/include/themes/sunrise/images/%%CACTIUSER%%_logo.gif
1083
%%CACTIDIR%%/include/themes/sunrise/images/cacti_logo.svg
1085
%%CACTIDIR%%/include/themes/sunrise/images/%%CACTIUSER%%_logo.svg
1084
%%CACTIDIR%%/include/themes/sunrise/images/favicon.ico
1086
%%CACTIDIR%%/include/themes/sunrise/images/favicon.ico
1085
%%CACTIDIR%%/include/themes/sunrise/images/favicon.png
1087
%%CACTIDIR%%/include/themes/sunrise/images/favicon.png
1086
%%CACTIDIR%%/include/themes/sunrise/images/index.php
1088
%%CACTIDIR%%/include/themes/sunrise/images/index.php
Lines 2038-2049 Link Here
2038
%%CACTIDIR%%/install/colors.csv
2040
%%CACTIDIR%%/install/colors.csv
2039
%%CACTIDIR%%/install/functions.php
2041
%%CACTIDIR%%/install/functions.php
2040
%%CACTIDIR%%/install/index.php
2042
%%CACTIDIR%%/install/index.php
2041
%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz
2042
%%CACTIDIR%%/install/install.css
2043
%%CACTIDIR%%/install/install.css
2043
%%CACTIDIR%%/install/install.js
2044
%%CACTIDIR%%/install/install.js
2044
%%CACTIDIR%%/install/install.php
2045
%%CACTIDIR%%/install/install.php
2045
%%CACTIDIR%%/install/step_json.php
2046
%%CACTIDIR%%/install/step_json.php
2046
%%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz
2047
%%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz
2048
%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz
2047
%%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz
2049
%%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz
2048
%%CACTIDIR%%/install/templates/Local_Linux_Machine.xml.gz
2050
%%CACTIDIR%%/install/templates/Local_Linux_Machine.xml.gz
2049
%%CACTIDIR%%/install/templates/NetSNMP_Device.xml.gz
2051
%%CACTIDIR%%/install/templates/NetSNMP_Device.xml.gz
Lines 2070-2083 Link Here
2070
%%CACTIDIR%%/install/upgrades/1_0_0.php
2072
%%CACTIDIR%%/install/upgrades/1_0_0.php
2071
%%CACTIDIR%%/install/upgrades/1_0_4.php
2073
%%CACTIDIR%%/install/upgrades/1_0_4.php
2072
%%CACTIDIR%%/install/upgrades/1_0_5.php
2074
%%CACTIDIR%%/install/upgrades/1_0_5.php
2073
%%CACTIDIR%%/install/upgrades/1_1_2.php
2074
%%CACTIDIR%%/install/upgrades/1_1_4.php
2075
%%CACTIDIR%%/install/upgrades/1_1_6.php
2076
%%CACTIDIR%%/install/upgrades/1_1_7.php
2077
%%CACTIDIR%%/install/upgrades/1_1_8.php
2078
%%CACTIDIR%%/install/upgrades/1_1_11.php
2075
%%CACTIDIR%%/install/upgrades/1_1_11.php
2079
%%CACTIDIR%%/install/upgrades/1_1_14.php
2076
%%CACTIDIR%%/install/upgrades/1_1_14.php
2080
%%CACTIDIR%%/install/upgrades/1_1_17.php
2077
%%CACTIDIR%%/install/upgrades/1_1_17.php
2078
%%CACTIDIR%%/install/upgrades/1_1_2.php
2081
%%CACTIDIR%%/install/upgrades/1_1_20.php
2079
%%CACTIDIR%%/install/upgrades/1_1_20.php
2082
%%CACTIDIR%%/install/upgrades/1_1_26.php
2080
%%CACTIDIR%%/install/upgrades/1_1_26.php
2083
%%CACTIDIR%%/install/upgrades/1_1_28.php
2081
%%CACTIDIR%%/install/upgrades/1_1_28.php
Lines 2086-2097 Link Here
2086
%%CACTIDIR%%/install/upgrades/1_1_35.php
2084
%%CACTIDIR%%/install/upgrades/1_1_35.php
2087
%%CACTIDIR%%/install/upgrades/1_1_36.php
2085
%%CACTIDIR%%/install/upgrades/1_1_36.php
2088
%%CACTIDIR%%/install/upgrades/1_1_37.php
2086
%%CACTIDIR%%/install/upgrades/1_1_37.php
2087
%%CACTIDIR%%/install/upgrades/1_1_4.php
2088
%%CACTIDIR%%/install/upgrades/1_1_6.php
2089
%%CACTIDIR%%/install/upgrades/1_1_7.php
2090
%%CACTIDIR%%/install/upgrades/1_1_8.php
2089
%%CACTIDIR%%/install/upgrades/1_2_0.php
2091
%%CACTIDIR%%/install/upgrades/1_2_0.php
2090
%%CACTIDIR%%/install/upgrades/1_2_1.php
2092
%%CACTIDIR%%/install/upgrades/1_2_1.php
2091
%%CACTIDIR%%/install/upgrades/1_2_2.php
2093
%%CACTIDIR%%/install/upgrades/1_2_2.php
2092
%%CACTIDIR%%/install/upgrades/1_2_3.php
2094
%%CACTIDIR%%/install/upgrades/1_2_3.php
2093
%%CACTIDIR%%/install/upgrades/1_2_5.php
2095
%%CACTIDIR%%/install/upgrades/1_2_5.php
2094
%%CACTIDIR%%/install/upgrades/1_2_7.php
2096
%%CACTIDIR%%/install/upgrades/1_2_7.php
2097
%%CACTIDIR%%/install/upgrades/1_2_8.php
2095
%%CACTIDIR%%/install/upgrades/index.php
2098
%%CACTIDIR%%/install/upgrades/index.php
2096
%%CACTIDIR%%/lib/aggregate.php
2099
%%CACTIDIR%%/lib/aggregate.php
2097
%%CACTIDIR%%/lib/api_aggregate.php
2100
%%CACTIDIR%%/lib/api_aggregate.php
Lines 2172-2178 Link Here
2172
%%CACTIDIR%%/locales/index.php
2175
%%CACTIDIR%%/locales/index.php
2173
%%CACTIDIR%%/locales/po/ar-SA.po
2176
%%CACTIDIR%%/locales/po/ar-SA.po
2174
%%CACTIDIR%%/locales/po/bg-BG.po
2177
%%CACTIDIR%%/locales/po/bg-BG.po
2175
%%CACTIDIR%%/locales/po/cacti.pot
2178
%%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot
2176
%%CACTIDIR%%/locales/po/de-DE.po
2179
%%CACTIDIR%%/locales/po/de-DE.po
2177
%%CACTIDIR%%/locales/po/el-GR.po
2180
%%CACTIDIR%%/locales/po/el-GR.po
2178
%%CACTIDIR%%/locales/po/es-ES.po
2181
%%CACTIDIR%%/locales/po/es-ES.po
Lines 2283-2291 Link Here
2283
@comment
2286
@comment
2284
@owner %%CACTIUSER%%
2287
@owner %%CACTIUSER%%
2285
@group %%CACTIGROUP%%
2288
@group %%CACTIGROUP%%
2286
@dir /var/log/cacti
2289
@dir /var/db/%%CACTIUSER%%/rra
2287
@dir /var/db/cacti/rra
2290
@dir /var/db/%%CACTIUSER%%/scripts
2288
@dir /var/db/cacti/scripts
2291
@dir /var/db/%%CACTIUSER%%
2289
@dir /var/db/cacti
2292
@dir /var/log/%%CACTIUSER%%
2290
@group wheel
2293
@group wheel
2291
@owner root
2294
@owner root

Return to bug 242834