Attachment #210177 for bug #242834

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

Lines 1-7 Link Here

(-)cacti128/Makefile (-1 / +1 lines)
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/

Lines 1-3 Link Here

(-)cacti128/distinfo (-3 / +3 lines)
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

Lines 1-11 Link Here

(-)cacti128/files/patch-include__global.php (-11 lines)
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)) {




--- include/global_settings.php.orig	2019-01-03 02:14:26 UTC
+++ include/global_settings.php
@@ -160,10 +160,10 @@ $settings = array(
 			),
 		'path_cactilog' => array(
 			'friendly_name' => __('Cacti Log Path'),
-			'description' => __('The path to your Cacti log file (if blank, defaults to &lt;path_cacti&gt;/log/cacti.log)'),
+			'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),
 			'method' => 'filepath',
 			'file_type' => 'ascii',
-			'default' => $config['base_path'] . '/log/cacti.log',
+			'default' => '/var/log/cacti/log',
 			'max_length' => '255',
 			'install_check' => 'writable'
 			),

Line 0 Link Here

(-)cacti128/files/patch-include_global.php (+11 lines)
	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)) {




--- include/global_settings.php.orig	2019-12-23 14:55:24 UTC
+++ include/global_settings.php
@@ -160,10 +160,10 @@ $settings = array(
 			),
 		'path_cactilog' => array(
 			'friendly_name' => __('Cacti Log Path'),
-			'description' => __('The path to your Cacti log file (if blank, defaults to &lt;path_cacti&gt;/log/cacti.log)'),
+			'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),
 			'method' => 'filepath',
 			'file_type' => 'ascii',
-			'default' => $config['base_path'] . '/log/cacti.log',
+			'default' => '/var/log/cacti/log',
 			'max_length' => '255',
 			'install_check' => 'writable',
 			'install_blank' => true

Lines 1-11 Link Here

(-)cacti128/files/patch-install__functions.php (-11 lines)
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 */

Line 0 Link Here

(-)cacti128/files/patch-install_functions.php (+11 lines)
	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 */

Lines 1-11 Link Here

(-)cacti128/files/patch-lib__clog_webapi.php (-11 lines)
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');

Lines 1-11 Link Here

(-)cacti128/files/patch-lib__functions.php (-11 lines)
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;

Line 0 Link Here

(-)cacti128/files/patch-lib_clog__webapi.php (+11 lines)
	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');

Line 0 Link Here

(-)cacti128/files/patch-lib_functions.php (+11 lines)
	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;

Lines 1-6 Link Here

(-)cacti128/files/patch-lib_installer.php (-2 / +2 lines)
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;

Line 0 Link Here

(-)cacti128/files/patch-poller__maintenance.php (+11 lines)
	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

Lines 1-11 Link Here

(-)cacti128/files/patch-poller_maintenance.php (-11 lines)
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

Lines 1-6 Link Here

(-)cacti128/files/patch-utilities.php (-4 / +4 lines)
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 == '') {




%%CACTIDIR%%/cache/realtime/index.php
%%CACTIDIR%%/cache/spikekill/.htaccess
%%CACTIDIR%%/cache/spikekill/index.php
%%CACTIDIR%%/%%CACTIUSER%%.sql
%%CACTIDIR%%/cdef.php
%%CACTIDIR%%/cli/.htaccess
%%CACTIDIR%%/cli/index.php
%%CACTIDIR%%/cli/add_data_query.php
%%CACTIDIR%%/cli/add_datasource.php
%%CACTIDIR%%/cli/add_device.php

%%CACTIDIR%%/cli/copy_user.php
%%CACTIDIR%%/cli/host_update_template.php
%%CACTIDIR%%/cli/import_package.php
%%CACTIDIR%%/cli/import_template.php
%%CACTIDIR%%/cli/index.php
%%CACTIDIR%%/cli/input_whitelist.php
%%CACTIDIR%%/cli/install_%%CACTIUSER%%.php
%%CACTIDIR%%/cli/md5sum.php
%%CACTIDIR%%/cli/import_template.php
%%CACTIDIR%%/cli/poller_data_sources_reapply_names.php
%%CACTIDIR%%/cli/poller_graphs_reapply_names.php
%%CACTIDIR%%/cli/poller_output_empty.php

%%CACTIDIR%%/data_debug.php
%%CACTIDIR%%/data_input.php
%%CACTIDIR%%/data_queries.php
%%CACTIDIR%%/data_sources.php
%%CACTIDIR%%/data_source_profiles.php
%%CACTIDIR%%/data_sources.php
%%CACTIDIR%%/data_templates.php
%%CACTIDIR%%/docs/Aggregate-Templates.html
%%CACTIDIR%%/docs/Aggregates.html

%%CACTIDIR%%/docs/How-To-Data-Query-Templates.html
%%CACTIDIR%%/docs/How-To-Determine-Template-Version.html
%%CACTIDIR%%/docs/How-To-SSH-Tunnels.html
%%CACTIDIR%%/docs/How-To-Setup-Remote-Pollers.html
%%CACTIDIR%%/docs/How-to-Graph-Your-Network.html
%%CACTIDIR%%/docs/How-to-Graph-a-Custom-Collection-Script.html
%%CACTIDIR%%/docs/Import-Template.html

%%CACTIDIR%%/docs/Plugins.html
%%CACTIDIR%%/docs/Principles-of-Operation.html
%%CACTIDIR%%/docs/RRDTool-Specific-Features.html
%%CACTIDIR%%/docs/RRDproxy.html
%%CACTIDIR%%/docs/Requirements.html
%%CACTIDIR%%/docs/SNMP-Data-Queries-Walkthrough.html
%%CACTIDIR%%/docs/SNMP-New-Data-Query-Walkthrough.html

%%CACTIDIR%%/docs/images/automation-tree-rules-edit3.png
%%CACTIDIR%%/docs/images/automation-tree-rules-edit4.png
%%CACTIDIR%%/docs/images/automation-tree-rules.png
%%CACTIDIR%%/docs/images/%%CACTIUSER%%-page-layout.png
%%CACTIDIR%%/docs/images/%%CACTIUSER%%-tree-view-page.png
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_add_device_site.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_add_sites.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_default_tree.png
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_device_datasource.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_managment.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_managment_graph.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_graph_template_options.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_remote_poller_setup.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_sites_automation.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_sites_page.png
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_system_utilities.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_thold_enable.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_thold_plugin_install.JPG
%%CACTIDIR%%/docs/images/%%CACTIUSER%%_trees_screen.png
%%CACTIDIR%%/docs/images/cdef-01.preview.png
%%CACTIDIR%%/docs/images/cdefs-edit1.png
%%CACTIDIR%%/docs/images/cdefs-edit2.png

%%CACTIDIR%%/docs/images/vdefs-edit4.png
%%CACTIDIR%%/docs/images/vdefs.png
%%CACTIDIR%%/docs/index.php
%%CACTIDIR%%/formats/%%CACTIUSER%%_group.format
%%CACTIDIR%%/formats/%%CACTIUSER%%_group_dark.format
%%CACTIDIR%%/formats/%%CACTIUSER%%_monitor.format
%%CACTIDIR%%/formats/default.format
%%CACTIDIR%%/formats/index.php
%%CACTIDIR%%/formats/lotus_notes.format

%%CACTIDIR%%/images/auth_background.gif
%%CACTIDIR%%/images/bullet_arrow_down.png
%%CACTIDIR%%/images/bullet_arrow_up.png
%%CACTIDIR%%/images/%%CACTIUSER%%_about_logo.gif
%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop.gif
%%CACTIDIR%%/images/%%CACTIUSER%%_backdrop2.gif
%%CACTIDIR%%/images/%%CACTIUSER%%_error_image.png
%%CACTIDIR%%/images/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/images/%%CACTIUSER%%_logo_new.gif
%%CACTIDIR%%/images/calendar.gif
%%CACTIDIR%%/images/chart_curve_go.png
%%CACTIDIR%%/images/cog.png

%%CACTIDIR%%/images/site.png
%%CACTIDIR%%/images/spikekill.gif
%%CACTIDIR%%/images/stop.png
%%CACTIDIR%%/images/tab_%%CACTIUSER%%.gif
%%CACTIDIR%%/images/tab_clog.png
%%CACTIDIR%%/images/tab_clog_down.png
%%CACTIDIR%%/images/tab_console.gif

%%CACTIDIR%%/images/view_page.png
%%CACTIDIR%%/include/auth.php
%%CACTIDIR%%/include/bottom_footer.php
%%CACTIDIR%%/include/%%CACTIUSER%%_version
%%CACTIDIR%%/include/cli_check.php
%%CACTIDIR%%/include/config.php.sample
%%CACTIDIR%%/include/content/README

%%CACTIDIR%%/include/js/d3.js
%%CACTIDIR%%/include/js/dygraph-combined.js
%%CACTIDIR%%/include/js/index.php
%%CACTIDIR%%/include/js/jquery-ui.js
%%CACTIDIR%%/include/js/jquery.colorpicker.js
%%CACTIDIR%%/include/js/jquery.cookie.js
%%CACTIDIR%%/include/js/jquery.dropdown.js

%%CACTIDIR%%/include/js/jquery.timepicker.js
%%CACTIDIR%%/include/js/jquery.ui.touch.punch.js
%%CACTIDIR%%/include/js/jquery.zoom.js
%%CACTIDIR%%/include/js/jquery-ui.js
%%CACTIDIR%%/include/js/js.storage.js
%%CACTIDIR%%/include/js/jstree.js
%%CACTIDIR%%/include/js/pace.js

%%CACTIDIR%%/include/themes/classic/images/bar-opacity.png
%%CACTIDIR%%/include/themes/classic/images/bar-pointer.png
%%CACTIDIR%%/include/themes/classic/images/bar.png
%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/include/themes/classic/images/favicon.ico
%%CACTIDIR%%/include/themes/classic/images/favicon.png
%%CACTIDIR%%/include/themes/classic/images/index.php

%%CACTIDIR%%/include/themes/dark/images/bar-opacity.png
%%CACTIDIR%%/include/themes/dark/images/bar-pointer.png
%%CACTIDIR%%/include/themes/dark/images/bar.png
%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop.gif
%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop2.gif
%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/include/themes/dark/images/favicon.ico
%%CACTIDIR%%/include/themes/dark/images/favicon.png
%%CACTIDIR%%/include/themes/dark/images/index.php

%%CACTIDIR%%/include/themes/modern/images/bar-opacity.png
%%CACTIDIR%%/include/themes/modern/images/bar-pointer.png
%%CACTIDIR%%/include/themes/modern/images/bar.png
%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/include/themes/modern/images/favicon.ico
%%CACTIDIR%%/include/themes/modern/images/favicon.png
%%CACTIDIR%%/include/themes/modern/images/index.php

%%CACTIDIR%%/include/themes/paper-plane/images/bar-opacity.png
%%CACTIDIR%%/include/themes/paper-plane/images/bar-pointer.png
%%CACTIDIR%%/include/themes/paper-plane/images/bar.png
%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/include/themes/paper-plane/images/favicon.ico
%%CACTIDIR%%/include/themes/paper-plane/images/favicon.png
%%CACTIDIR%%/include/themes/paper-plane/images/index.php

%%CACTIDIR%%/include/themes/paw/images/bar-opacity.png
%%CACTIDIR%%/include/themes/paw/images/bar-pointer.png
%%CACTIDIR%%/include/themes/paw/images/bar.png
%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/include/themes/paw/images/favicon.ico
%%CACTIDIR%%/include/themes/paw/images/favicon.png
%%CACTIDIR%%/include/themes/paw/images/index.php

%%CACTIDIR%%/include/themes/sunrise/images/bar-opacity.png
%%CACTIDIR%%/include/themes/sunrise/images/bar-pointer.png
%%CACTIDIR%%/include/themes/sunrise/images/bar.png
%%CACTIDIR%%/include/themes/sunrise/images/%%CACTIUSER%%_logo.gif
%%CACTIDIR%%/include/themes/sunrise/images/%%CACTIUSER%%_logo.svg
%%CACTIDIR%%/include/themes/sunrise/images/favicon.ico
%%CACTIDIR%%/include/themes/sunrise/images/favicon.png
%%CACTIDIR%%/include/themes/sunrise/images/index.php

%%CACTIDIR%%/install/colors.csv
%%CACTIDIR%%/install/functions.php
%%CACTIDIR%%/install/index.php
%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz
%%CACTIDIR%%/install/install.css
%%CACTIDIR%%/install/install.js
%%CACTIDIR%%/install/install.php
%%CACTIDIR%%/install/step_json.php
%%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz
%%CACTIDIR%%/install/templates/Cisco_Router.xml.gz
%%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz
%%CACTIDIR%%/install/templates/Local_Linux_Machine.xml.gz
%%CACTIDIR%%/install/templates/NetSNMP_Device.xml.gz

%%CACTIDIR%%/install/upgrades/1_0_0.php
%%CACTIDIR%%/install/upgrades/1_0_4.php
%%CACTIDIR%%/install/upgrades/1_0_5.php
%%CACTIDIR%%/install/upgrades/1_1_2.php
%%CACTIDIR%%/install/upgrades/1_1_4.php
%%CACTIDIR%%/install/upgrades/1_1_6.php
%%CACTIDIR%%/install/upgrades/1_1_7.php
%%CACTIDIR%%/install/upgrades/1_1_8.php
%%CACTIDIR%%/install/upgrades/1_1_11.php
%%CACTIDIR%%/install/upgrades/1_1_14.php
%%CACTIDIR%%/install/upgrades/1_1_17.php
%%CACTIDIR%%/install/upgrades/1_1_2.php
%%CACTIDIR%%/install/upgrades/1_1_20.php
%%CACTIDIR%%/install/upgrades/1_1_26.php
%%CACTIDIR%%/install/upgrades/1_1_28.php

%%CACTIDIR%%/install/upgrades/1_1_35.php
%%CACTIDIR%%/install/upgrades/1_1_36.php
%%CACTIDIR%%/install/upgrades/1_1_37.php
%%CACTIDIR%%/install/upgrades/1_1_4.php
%%CACTIDIR%%/install/upgrades/1_1_6.php
%%CACTIDIR%%/install/upgrades/1_1_7.php
%%CACTIDIR%%/install/upgrades/1_1_8.php
%%CACTIDIR%%/install/upgrades/1_2_0.php
%%CACTIDIR%%/install/upgrades/1_2_1.php
%%CACTIDIR%%/install/upgrades/1_2_2.php
%%CACTIDIR%%/install/upgrades/1_2_3.php
%%CACTIDIR%%/install/upgrades/1_2_5.php
%%CACTIDIR%%/install/upgrades/1_2_7.php
%%CACTIDIR%%/install/upgrades/1_2_8.php
%%CACTIDIR%%/install/upgrades/index.php
%%CACTIDIR%%/lib/aggregate.php
%%CACTIDIR%%/lib/api_aggregate.php

%%CACTIDIR%%/locales/index.php
%%CACTIDIR%%/locales/po/ar-SA.po
%%CACTIDIR%%/locales/po/bg-BG.po
%%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot
%%CACTIDIR%%/locales/po/de-DE.po
%%CACTIDIR%%/locales/po/el-GR.po
%%CACTIDIR%%/locales/po/es-ES.po

@comment
@owner %%CACTIUSER%%
@group %%CACTIGROUP%%
@dir /var/db/%%CACTIUSER%%/rra
@dir /var/db/%%CACTIUSER%%/scripts
@dir /var/db/%%CACTIUSER%%
@dir /var/log/%%CACTIUSER%%
@group wheel
@owner root

Return to bug 242834

Lines 1-15 Link Here

(-)cacti128/files/patch-include__global_settings.php (-15 lines)
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	),

Line 0 Link Here

(-)cacti128/files/patch-include_global__settings.php (+15 lines)
	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