Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

[ipfire-2.x.git] / config / rootfiles / packages / cacti

diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti
index d72937a14cbabb41d6d65e56b8fe935c92465846..de0e2c7734cff2422acc7829bca0ced7ea7a4104 100644 (file)
--- a/config/rootfiles/packages/cacti
+++ b/config/rootfiles/packages/cacti
@@ -1,5 +1,7 @@
 etc/fcron.cyclic/cacti.cron
 etc/httpd/conf/vhosts.d/cacti.conf
+#etc/logrotate.d
+etc/logrotate.d/cacti
 #usr/share/cacti
 #usr/share/cacti/LICENSE
 #usr/share/cacti/README
@@ -16,14 +18,20 @@ usr/share/cacti/cli/add_graph_template.php
 usr/share/cacti/cli/add_graphs.php
 usr/share/cacti/cli/add_perms.php
 usr/share/cacti/cli/add_tree.php
+usr/share/cacti/cli/analyze_database.php
+usr/share/cacti/cli/convert_innodb.php
 usr/share/cacti/cli/copy_user.php
+usr/share/cacti/cli/data_template_associate_rra.php
 usr/share/cacti/cli/host_update_template.php
+usr/share/cacti/cli/import_template.php
 usr/share/cacti/cli/poller_data_sources_reapply_names.php
 usr/share/cacti/cli/poller_graphs_reapply_names.php
 usr/share/cacti/cli/poller_output_empty.php
 usr/share/cacti/cli/poller_reindex_hosts.php
 usr/share/cacti/cli/rebuild_poller_cache.php
+usr/share/cacti/cli/reorder_data_query.php
 usr/share/cacti/cli/repair_database.php
+usr/share/cacti/cli/repair_templates.php
 usr/share/cacti/cli/structure_rra_paths.php
 usr/share/cacti/cli/upgrade_database.php
 usr/share/cacti/cmd.php
@@ -35,10 +43,7 @@ usr/share/cacti/data_templates.php
 #usr/share/cacti/docs
 #usr/share/cacti/docs/CHANGELOG
 #usr/share/cacti/docs/CONTRIB
-#usr/share/cacti/docs/INSTALL
 #usr/share/cacti/docs/README
-#usr/share/cacti/docs/REQUIREMENTS
-#usr/share/cacti/docs/UPGRADE
 #usr/share/cacti/docs/html
 #usr/share/cacti/docs/html/LICENSE.html
 #usr/share/cacti/docs/html/advanced_topics.html
@@ -115,7 +120,6 @@ usr/share/cacti/data_templates.php
 #usr/share/cacti/docs/html/install_windows.html
 #usr/share/cacti/docs/html/installation.html
 #usr/share/cacti/docs/html/making_scripts_work_with_cacti.html
-#usr/share/cacti/docs/html/manual.css
 #usr/share/cacti/docs/html/migration_php_scripts_to_script_server.html
 #usr/share/cacti/docs/html/new_graphs.html
 #usr/share/cacti/docs/html/operating_principles.html
@@ -143,8 +147,8 @@ usr/share/cacti/data_templates.php
 #usr/share/cacti/docs/html/variables.html
 #usr/share/cacti/docs/pdf
 #usr/share/cacti/docs/pdf/README
-#usr/share/cacti/docs/text
-#usr/share/cacti/docs/text/manual.txt
+#usr/share/cacti/docs/txt
+#usr/share/cacti/docs/txt/manual.txt
 usr/share/cacti/gprint_presets.php
 usr/share/cacti/graph.php
 usr/share/cacti/graph_image.php
@@ -190,12 +194,17 @@ usr/share/cacti/images/cacti_logo.gif
 usr/share/cacti/images/calendar.gif
 usr/share/cacti/images/delete_icon.gif
 usr/share/cacti/images/delete_icon_large.gif
+usr/share/cacti/images/disable_icon.png
+usr/share/cacti/images/enable_icon.png
+usr/share/cacti/images/enable_icon_disabled.png
 usr/share/cacti/images/favicon.ico
 usr/share/cacti/images/graph_page_top.gif
 usr/share/cacti/images/graph_properties.gif
 usr/share/cacti/images/graph_query.png
 usr/share/cacti/images/graph_zoom.gif
 usr/share/cacti/images/hide.gif
+usr/share/cacti/images/install_icon.png
+usr/share/cacti/images/install_icon_disabled.png
 usr/share/cacti/images/left_border.gif
 usr/share/cacti/images/menu_line.gif
 usr/share/cacti/images/menuarrow.gif
@@ -221,6 +230,8 @@ usr/share/cacti/images/tab_mode_tree_down.gif
 usr/share/cacti/images/tab_settings.gif
 usr/share/cacti/images/tab_settings_down.gif
 usr/share/cacti/images/transparent_line.gif
+usr/share/cacti/images/uninstall_icon.gif
+usr/share/cacti/images/view_none.gif
 #usr/share/cacti/include
 usr/share/cacti/include/auth.php
 usr/share/cacti/include/bottom_footer.php
@@ -230,10 +241,28 @@ usr/share/cacti/include/global_arrays.php
 usr/share/cacti/include/global_constants.php
 usr/share/cacti/include/global_form.php
 usr/share/cacti/include/global_settings.php
-#usr/share/cacti/include/jscalendar
+usr/share/cacti/include/js
+usr/share/cacti/include/js/jquery
+usr/share/cacti/include/js/jquery/colorpicker.js
+usr/share/cacti/include/js/jquery/jquery-ui.js
+usr/share/cacti/include/js/jquery/jquery.cookie.js
+usr/share/cacti/include/js/jquery/jquery.dd.js
+usr/share/cacti/include/js/jquery/jquery.dropdown.js
+usr/share/cacti/include/js/jquery/jquery.js
+usr/share/cacti/include/js/jquery/jquery.jstree.js
+usr/share/cacti/include/js/jquery/jquery.tablednd.js
+usr/share/cacti/include/js/jquery/jquery.timepicker.js
+usr/share/cacti/include/js/jquery/jquery.zoom.js
+usr/share/cacti/include/js/jquery/themes
+usr/share/cacti/include/js/jquery/themes/default
+usr/share/cacti/include/js/jquery/themes/default/d.gif
+usr/share/cacti/include/js/jquery/themes/default/d.png
+usr/share/cacti/include/js/jquery/themes/default/style.css
+usr/share/cacti/include/js/jquery/themes/default/throbber.gif
+usr/share/cacti/include/jscalendar
 usr/share/cacti/include/jscalendar/calendar-setup.js
 usr/share/cacti/include/jscalendar/calendar.js
-#usr/share/cacti/include/jscalendar/lang
+usr/share/cacti/include/jscalendar/lang
 usr/share/cacti/include/jscalendar/lang/calendar-af.js
 usr/share/cacti/include/jscalendar/lang/calendar-al.js
 usr/share/cacti/include/jscalendar/lang/calendar-bg.js
@@ -279,41 +308,38 @@ usr/share/cacti/include/jscalendar/lang/calendar-zh.js
 usr/share/cacti/include/jscalendar/lang/cn_utf8.js
 usr/share/cacti/include/layout.js
 usr/share/cacti/include/main.css
+usr/share/cacti/include/plugins.php
 usr/share/cacti/include/top_graph_header.php
 usr/share/cacti/include/top_header.php
-#usr/share/cacti/include/treeview
-usr/share/cacti/include/treeview/ftiens4.js
-usr/share/cacti/include/treeview/ftiens4_export.js
-usr/share/cacti/include/treeview/ftv2blank.gif
-usr/share/cacti/include/treeview/ftv2lastnode.gif
-usr/share/cacti/include/treeview/ftv2mlastnode.gif
-usr/share/cacti/include/treeview/ftv2mnode.gif
-usr/share/cacti/include/treeview/ftv2node.gif
-usr/share/cacti/include/treeview/ftv2plastnode.gif
-usr/share/cacti/include/treeview/ftv2pnode.gif
-usr/share/cacti/include/treeview/ftv2vertline.gif
-usr/share/cacti/include/treeview/ua.js
 usr/share/cacti/include/zoom.js
 usr/share/cacti/index.php
 #usr/share/cacti/install
-#usr/share/cacti/install/0_8_1_to_0_8_2.php
-#usr/share/cacti/install/0_8_2_to_0_8_2a.php
-#usr/share/cacti/install/0_8_2a_to_0_8_3.php
-#usr/share/cacti/install/0_8_3_to_0_8_4.php
-#usr/share/cacti/install/0_8_4_to_0_8_5.php
-#usr/share/cacti/install/0_8_5a_to_0_8_6.php
-#usr/share/cacti/install/0_8_6_to_0_8_6a.php
-#usr/share/cacti/install/0_8_6c_to_0_8_6d.php
-#usr/share/cacti/install/0_8_6d_to_0_8_6e.php
-#usr/share/cacti/install/0_8_6f_to_0_8_6g.php
-#usr/share/cacti/install/0_8_6g_to_0_8_6h.php
-#usr/share/cacti/install/0_8_6h_to_0_8_6i.php
-#usr/share/cacti/install/0_8_6j_to_0_8_7.php
-#usr/share/cacti/install/0_8_7_to_0_8_7a.php
-#usr/share/cacti/install/0_8_7a_to_0_8_7b.php
-#usr/share/cacti/install/0_8_7b_to_0_8_7c.php
-#usr/share/cacti/install/0_8_7c_to_0_8_7d.php
-#usr/share/cacti/install/0_8_to_0_8_1.php
+usr/share/cacti/install/0_8_1_to_0_8_2.php
+usr/share/cacti/install/0_8_2_to_0_8_2a.php
+usr/share/cacti/install/0_8_2a_to_0_8_3.php
+usr/share/cacti/install/0_8_3_to_0_8_4.php
+usr/share/cacti/install/0_8_4_to_0_8_5.php
+usr/share/cacti/install/0_8_5a_to_0_8_6.php
+usr/share/cacti/install/0_8_6_to_0_8_6a.php
+usr/share/cacti/install/0_8_6c_to_0_8_6d.php
+usr/share/cacti/install/0_8_6d_to_0_8_6e.php
+usr/share/cacti/install/0_8_6f_to_0_8_6g.php
+usr/share/cacti/install/0_8_6g_to_0_8_6h.php
+usr/share/cacti/install/0_8_6h_to_0_8_6i.php
+usr/share/cacti/install/0_8_6j_to_0_8_7.php
+usr/share/cacti/install/0_8_7_to_0_8_7a.php
+usr/share/cacti/install/0_8_7a_to_0_8_7b.php
+usr/share/cacti/install/0_8_7b_to_0_8_7c.php
+usr/share/cacti/install/0_8_7c_to_0_8_7d.php
+usr/share/cacti/install/0_8_7d_to_0_8_7e.php
+usr/share/cacti/install/0_8_7e_to_0_8_7f.php
+usr/share/cacti/install/0_8_7f_to_0_8_7g.php
+usr/share/cacti/install/0_8_7g_to_0_8_7h.php
+usr/share/cacti/install/0_8_7h_to_0_8_7i.php
+usr/share/cacti/install/0_8_7i_to_0_8_8.php
+usr/share/cacti/install/0_8_8_to_0_8_8a.php
+usr/share/cacti/install/0_8_8_to_0_8_8b.php
+usr/share/cacti/install/0_8_to_0_8_1.php
 usr/share/cacti/install/index.php
 usr/share/cacti/install/install_finish.gif
 usr/share/cacti/install/install_next.gif
@@ -333,7 +359,7 @@ usr/share/cacti/lib/adodb/adodb-php4.inc.php
 usr/share/cacti/lib/adodb/adodb-time.inc.php
 usr/share/cacti/lib/adodb/adodb-xmlschema.inc.php
 usr/share/cacti/lib/adodb/adodb.inc.php
-#usr/share/cacti/lib/adodb/datadict
+usr/share/cacti/lib/adodb/datadict
 usr/share/cacti/lib/adodb/datadict/datadict-access.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-db2.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-firebird.inc.php
@@ -346,7 +372,7 @@ usr/share/cacti/lib/adodb/datadict/datadict-oci8.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-postgres.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-sapdb.inc.php
 usr/share/cacti/lib/adodb/datadict/datadict-sybase.inc.php
-#usr/share/cacti/lib/adodb/drivers
+usr/share/cacti/lib/adodb/drivers
 usr/share/cacti/lib/adodb/drivers/adodb-access.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-ado.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-ado5.inc.php
@@ -387,7 +413,7 @@ usr/share/cacti/lib/adodb/drivers/adodb-sqlite.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-sqlitepo.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-sybase.inc.php
 usr/share/cacti/lib/adodb/drivers/adodb-vfp.inc.php
-#usr/share/cacti/lib/adodb/lang
+usr/share/cacti/lib/adodb/lang
 usr/share/cacti/lib/adodb/lang/adodb-ar.inc.php
 usr/share/cacti/lib/adodb/lang/adodb-bg.inc.php
 usr/share/cacti/lib/adodb/lang/adodb-bgutf8.inc.php
@@ -432,6 +458,7 @@ usr/share/cacti/lib/html_validate.php
 usr/share/cacti/lib/import.php
 usr/share/cacti/lib/ldap.php
 usr/share/cacti/lib/ping.php
+usr/share/cacti/lib/plugins.php
 usr/share/cacti/lib/poller.php
 usr/share/cacti/lib/rrd.php
 usr/share/cacti/lib/snmp.php
@@ -443,10 +470,11 @@ usr/share/cacti/lib/tree.php
 usr/share/cacti/lib/utility.php
 usr/share/cacti/lib/variables.php
 usr/share/cacti/lib/xml.php
-#usr/share/cacti/log
-usr/share/cacti/log/.htaccess
-usr/share/cacti/log/cacti.log
+usr/share/cacti/log
 usr/share/cacti/logout.php
+usr/share/cacti/plugins
+usr/share/cacti/plugins.php
+usr/share/cacti/plugins/index.php
 usr/share/cacti/poller.php
 usr/share/cacti/poller_commands.php
 usr/share/cacti/poller_export.php
@@ -465,9 +493,8 @@ usr/share/cacti/resource/snmp_queries/kbridge.xml
 usr/share/cacti/resource/snmp_queries/net-snmp_disk.xml
 usr/share/cacti/resource/snmp_queries/netware_cpu.xml
 usr/share/cacti/resource/snmp_queries/netware_disk.xml
-#usr/share/cacti/rra
+usr/share/cacti/rra
 usr/share/cacti/rra.php
-usr/share/cacti/rra/.placeholder
 usr/share/cacti/script_server.php
 usr/share/cacti/script_server.pl
 #usr/share/cacti/scripts
@@ -497,4 +524,10 @@ usr/share/cacti/templates_import.php
 usr/share/cacti/tree.php
 usr/share/cacti/user_admin.php
 usr/share/cacti/utilities.php
+#var/cacti
+#var/cacti/log
+var/cacti/log/.htaccess
+#var/cacti/log/cacti.log
+#var/cacti/rra
+var/cacti/rra/.htaccess
 var/ipfire/backup/addons/includes/cacti