--- cacti128/Makefile 2019-10-02 16:53:51.000000000 +0200 +++ cacti128/Makefile 2019-12-23 15:51:50.427159000 +0100 @@ -1,7 +1,7 @@ # $FreeBSD: head/net-mgmt/cacti/Makefile 513582 2019-10-02 14:53:51Z kai $ PORTNAME= cacti -PORTVERSION= 1.2.7 +PORTVERSION= 1.2.8 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ --- cacti128/distinfo 2019-10-02 16:53:51.000000000 +0200 +++ cacti128/distinfo 2019-12-23 15:52:03.024442000 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1569956243 -SHA256 (cacti-1.2.7.tar.gz) = 45b4d57964aa2e11176f03f866be9c4e5850eaa5abe83137b61b3fe9d7ddce34 -SIZE (cacti-1.2.7.tar.gz) = 24819135 +TIMESTAMP = 1577112723 +SHA256 (cacti-1.2.8.tar.gz) = ca4b83d1963a358c9ab60276becc46553fa0125d1ad906c2d26278a485615a29 +SIZE (cacti-1.2.8.tar.gz) = 24881361 --- cacti128/files/patch-include__global.php 2019-04-10 23:10:00.000000000 +0200 +++ cacti128/files/patch-include__global.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- include/global.php.orig 2019-03-30 23:40:22 UTC -+++ include/global.php -@@ -216,7 +216,7 @@ if ($config['cacti_server_os'] == 'win32') { - $config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__)); - } - $config['include_path'] = dirname(__FILE__); --$config['rra_path'] = $config['base_path'] . '/rra'; -+$config['rra_path'] = '/var/db/cacti/rra'; - - /* for multiple pollers, we need to know this location */ - if (!isset($scripts_path)) { --- cacti128/files/patch-include__global_settings.php 2019-01-08 19:13:55.000000000 +0100 +++ cacti128/files/patch-include__global_settings.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ ---- 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 <path_cacti>/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' - ), --- cacti128/files/patch-include_global.php 1970-01-01 01:00:00.000000000 +0100 +++ cacti128/files/patch-include_global.php 2019-12-23 16:05:56.790766000 +0100 @@ -0,0 +1,11 @@ +--- include/global.php.orig 2019-12-23 14:55:38 UTC ++++ include/global.php +@@ -225,7 +225,7 @@ if ($config['cacti_server_os'] == 'win32') { + $config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__)); + } + $config['include_path'] = dirname(__FILE__); +-$config['rra_path'] = $config['base_path'] . '/rra'; ++$config['rra_path'] = '/var/db/cacti/rra'; + + /* for multiple pollers, we need to know this location */ + if (!isset($scripts_path)) { --- cacti128/files/patch-include_global__settings.php 1970-01-01 01:00:00.000000000 +0100 +++ cacti128/files/patch-include_global__settings.php 2019-12-23 16:05:56.792016000 +0100 @@ -0,0 +1,15 @@ +--- 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 <path_cacti>/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 --- cacti128/files/patch-install__functions.php 2019-08-19 22:25:28.000000000 +0200 +++ cacti128/files/patch-install__functions.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- install/functions.php.orig 2019-07-15 19:23:30 UTC -+++ install/functions.php -@@ -538,7 +538,7 @@ function install_file_paths() { - } - - if (empty($input['path_cactilog']['default'])) { -- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log'; -+ $input['path_cactilog']['default'] = '/var/log/cacti/log'; - } - - /* stderr log file path */ --- cacti128/files/patch-install_functions.php 1970-01-01 01:00:00.000000000 +0100 +++ cacti128/files/patch-install_functions.php 2019-12-23 16:05:56.793207000 +0100 @@ -0,0 +1,11 @@ +--- install/functions.php.orig 2019-12-23 14:55:09 UTC ++++ install/functions.php +@@ -544,7 +544,7 @@ function install_file_paths() { + } + + if (empty($input['path_cactilog']['default'])) { +- $input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log'; ++ $input['path_cactilog']['default'] = '/var/log/cacti/log'; + } + + /* stderr log file path */ --- cacti128/files/patch-lib__clog_webapi.php 2019-01-06 17:32:03.000000000 +0100 +++ cacti128/files/patch-lib__clog_webapi.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- lib/clog_webapi.php.orig 2019-01-03 02:14:26 UTC -+++ lib/clog_webapi.php -@@ -56,7 +56,7 @@ function clog_validate_filename(&$file, &$filepath, &$ - $logbase = basename($logfile); - - if ($logfile == '') { -- $logfile = $config['base_path'] . '/log/cacti.log'; -+ $logfile = '/var/log/cacti/log'; - } - - $errfile = read_config_option('path_stderrlog'); --- cacti128/files/patch-lib__functions.php 2019-01-06 17:32:03.000000000 +0100 +++ cacti128/files/patch-lib__functions.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- lib/functions.php.orig 2019-01-03 02:14:26 UTC -+++ lib/functions.php -@@ -818,7 +818,7 @@ function cacti_log_file() { - global $config; - $logfile = read_config_option('path_cactilog'); - if ($logfile == '') { -- $logfile = $config['base_path'] . '/log/cacti.log'; -+ $logfile = '/var/log/cacti/log'; - } - $config['log_path'] = $logfile; - return $logfile; --- cacti128/files/patch-lib_clog__webapi.php 1970-01-01 01:00:00.000000000 +0100 +++ cacti128/files/patch-lib_clog__webapi.php 2019-12-23 16:05:56.794398000 +0100 @@ -0,0 +1,11 @@ +--- lib/clog_webapi.php.orig 2019-12-23 14:54:55 UTC ++++ lib/clog_webapi.php +@@ -58,7 +58,7 @@ function clog_validate_filename(&$file, &$filepath, &$ + $logbase = basename($logfile); + + if ($logfile == '') { +- $logfile = $config['base_path'] . '/log/cacti.log'; ++ $logfile = '/var/log/cacti/log'; + } + + $errfile = read_config_option('path_stderrlog'); --- cacti128/files/patch-lib_functions.php 1970-01-01 01:00:00.000000000 +0100 +++ cacti128/files/patch-lib_functions.php 2019-12-23 16:05:56.795588000 +0100 @@ -0,0 +1,11 @@ +--- lib/functions.php.orig 2019-12-23 14:54:42 UTC ++++ lib/functions.php +@@ -854,7 +854,7 @@ function cacti_log_file() { + global $config; + $logfile = read_config_option('path_cactilog'); + if ($logfile == '') { +- $logfile = $config['base_path'] . '/log/cacti.log'; ++ $logfile = '/var/log/cacti/log'; + } + $config['log_path'] = $logfile; + return $logfile; --- cacti128/files/patch-lib_installer.php 2019-10-02 16:53:51.000000000 +0200 +++ cacti128/files/patch-lib_installer.php 2019-12-23 16:05:56.796764000 +0100 @@ -1,6 +1,6 @@ ---- lib/installer.php.orig 2019-09-29 18:36:29 UTC +--- lib/installer.php.orig 2019-12-23 14:54:27 UTC +++ lib/installer.php -@@ -3226,7 +3226,7 @@ class Installer implements JsonSerializable { +@@ -3252,7 +3252,7 @@ class Installer implements JsonSerializable { global $config; $page_nr = 1; --- cacti128/files/patch-poller__maintenance.php 1970-01-01 01:00:00.000000000 +0100 +++ cacti128/files/patch-poller__maintenance.php 2019-12-23 16:05:56.797956000 +0100 @@ -0,0 +1,11 @@ +--- poller_maintenance.php.orig 2019-12-23 14:54:13 UTC ++++ poller_maintenance.php +@@ -227,7 +227,7 @@ function logrotate_rotatenow() { + $logs = array(); + $log = read_config_option('path_cactilog'); + if (empty($log)) { +- $log = $config['base_path'] . '/log/cacti.log'; ++ $log = '/var/log/cacti/log'; + } + $logs['Cacti'] = $log; + --- cacti128/files/patch-poller_maintenance.php 2019-01-06 17:32:03.000000000 +0100 +++ cacti128/files/patch-poller_maintenance.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- poller_maintenance.php.orig 2019-01-03 02:14:26 UTC -+++ poller_maintenance.php -@@ -227,7 +227,7 @@ function logrotate_rotatenow() { - $logs = array(); - $log = read_config_option('path_cactilog'); - if (empty($log)) { -- $log = $config['base_path'] . '/log/cacti.log'; -+ $log = '/var/log/cacti/log'; - } - $logs['Cacti'] = $log; - --- cacti128/files/patch-utilities.php 2017-08-15 01:20:01.000000000 +0200 +++ cacti128/files/patch-utilities.php 2019-12-23 16:05:56.799125000 +0100 @@ -1,6 +1,6 @@ ---- utilities.php.orig 2017-08-13 04:06:37 UTC +--- utilities.php.orig 2019-12-23 14:54:02 UTC +++ utilities.php -@@ -877,7 +877,7 @@ function utilities_view_logfile() { +@@ -920,7 +920,7 @@ function utilities_view_logfile() { } if ($logfile == '') { @@ -8,8 +8,8 @@ + $logfile = '/var/log/cacti/log'; } - /* ================= input validation and session storage ================= */ -@@ -1199,7 +1199,7 @@ function utilities_clear_logfile() { + if (get_nfilter_request_var('filename') != '') { +@@ -1246,7 +1246,7 @@ function utilities_clear_logfile() { $logfile = read_config_option('path_cactilog'); if ($logfile == '') { --- cacti128/pkg-plist 2019-10-02 16:53:51.000000000 +0200 +++ cacti128/pkg-plist 2019-12-23 16:14:21.988063000 +0100 @@ -24,10 +24,9 @@ %%CACTIDIR%%/cache/realtime/index.php %%CACTIDIR%%/cache/spikekill/.htaccess %%CACTIDIR%%/cache/spikekill/index.php -%%CACTIDIR%%/cacti.sql +%%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 @@ -42,10 +41,11 @@ %%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_cacti.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 @@ -73,8 +73,8 @@ %%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 @@ -111,6 +111,7 @@ %%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 @@ -128,6 +129,7 @@ %%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 @@ -192,22 +194,22 @@ %%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/cacti-page-layout.png -%%CACTIDIR%%/docs/images/cacti-tree-view-page.png -%%CACTIDIR%%/docs/images/cacti_add_device_site.JPG -%%CACTIDIR%%/docs/images/cacti_add_sites.JPG -%%CACTIDIR%%/docs/images/cacti_default_tree.png -%%CACTIDIR%%/docs/images/cacti_device_datasource.JPG -%%CACTIDIR%%/docs/images/cacti_graph_managment.JPG -%%CACTIDIR%%/docs/images/cacti_graph_managment_graph.JPG -%%CACTIDIR%%/docs/images/cacti_graph_template_options.JPG -%%CACTIDIR%%/docs/images/cacti_remote_poller_setup.JPG -%%CACTIDIR%%/docs/images/cacti_sites_automation.JPG -%%CACTIDIR%%/docs/images/cacti_sites_page.png -%%CACTIDIR%%/docs/images/cacti_system_utilities.JPG -%%CACTIDIR%%/docs/images/cacti_thold_enable.JPG -%%CACTIDIR%%/docs/images/cacti_thold_plugin_install.JPG -%%CACTIDIR%%/docs/images/cacti_trees_screen.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 @@ -478,9 +480,9 @@ %%CACTIDIR%%/docs/images/vdefs-edit4.png %%CACTIDIR%%/docs/images/vdefs.png %%CACTIDIR%%/docs/index.php -%%CACTIDIR%%/formats/cacti_group.format -%%CACTIDIR%%/formats/cacti_group_dark.format -%%CACTIDIR%%/formats/cacti_monitor.format +%%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 @@ -505,13 +507,13 @@ %%CACTIDIR%%/images/auth_background.gif %%CACTIDIR%%/images/bullet_arrow_down.png %%CACTIDIR%%/images/bullet_arrow_up.png -%%CACTIDIR%%/images/cacti_about_logo.gif -%%CACTIDIR%%/images/cacti_backdrop.gif -%%CACTIDIR%%/images/cacti_backdrop2.gif -%%CACTIDIR%%/images/cacti_error_image.png -%%CACTIDIR%%/images/cacti_logo.gif -%%CACTIDIR%%/images/cacti_logo_new.gif -%%CACTIDIR%%/images/cacti_logo.svg +%%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 @@ -553,7 +555,7 @@ %%CACTIDIR%%/images/site.png %%CACTIDIR%%/images/spikekill.gif %%CACTIDIR%%/images/stop.png -%%CACTIDIR%%/images/tab_cacti.gif +%%CACTIDIR%%/images/tab_%%CACTIUSER%%.gif %%CACTIDIR%%/images/tab_clog.png %%CACTIDIR%%/images/tab_clog_down.png %%CACTIDIR%%/images/tab_console.gif @@ -586,7 +588,7 @@ %%CACTIDIR%%/images/view_page.png %%CACTIDIR%%/include/auth.php %%CACTIDIR%%/include/bottom_footer.php -%%CACTIDIR%%/include/cacti_version +%%CACTIDIR%%/include/%%CACTIUSER%%_version %%CACTIDIR%%/include/cli_check.php %%CACTIDIR%%/include/config.php.sample %%CACTIDIR%%/include/content/README @@ -782,6 +784,7 @@ %%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 @@ -798,7 +801,6 @@ %%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 @@ -821,8 +823,8 @@ %%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/cacti_logo.gif -%%CACTIDIR%%/include/themes/classic/images/cacti_logo.svg +%%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 @@ -871,10 +873,10 @@ %%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/cacti_backdrop.gif -%%CACTIDIR%%/include/themes/dark/images/cacti_backdrop2.gif -%%CACTIDIR%%/include/themes/dark/images/cacti_logo.gif -%%CACTIDIR%%/include/themes/dark/images/cacti_logo.svg +%%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 @@ -926,8 +928,8 @@ %%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/cacti_logo.gif -%%CACTIDIR%%/include/themes/modern/images/cacti_logo.svg +%%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 @@ -977,8 +979,8 @@ %%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/cacti_logo.gif -%%CACTIDIR%%/include/themes/paper-plane/images/cacti_logo.svg +%%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 @@ -1028,8 +1030,8 @@ %%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/cacti_logo.gif -%%CACTIDIR%%/include/themes/paw/images/cacti_logo.svg +%%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 @@ -1079,8 +1081,8 @@ %%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/cacti_logo.gif -%%CACTIDIR%%/include/themes/sunrise/images/cacti_logo.svg +%%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 @@ -2038,12 +2040,12 @@ %%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 @@ -2070,14 +2072,10 @@ %%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 @@ -2086,12 +2084,17 @@ %%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 @@ -2172,7 +2175,7 @@ %%CACTIDIR%%/locales/index.php %%CACTIDIR%%/locales/po/ar-SA.po %%CACTIDIR%%/locales/po/bg-BG.po -%%CACTIDIR%%/locales/po/cacti.pot +%%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot %%CACTIDIR%%/locales/po/de-DE.po %%CACTIDIR%%/locales/po/el-GR.po %%CACTIDIR%%/locales/po/es-ES.po @@ -2283,9 +2286,9 @@ @comment @owner %%CACTIUSER%% @group %%CACTIGROUP%% -@dir /var/log/cacti -@dir /var/db/cacti/rra -@dir /var/db/cacti/scripts -@dir /var/db/cacti +@dir /var/db/%%CACTIUSER%%/rra +@dir /var/db/%%CACTIUSER%%/scripts +@dir /var/db/%%CACTIUSER%% +@dir /var/log/%%CACTIUSER%% @group wheel @owner root