From: Arne Fitzenreiter Date: Sun, 17 May 2009 12:30:46 +0000 (+0200) Subject: Add backup include for cacti, rootfile update X-Git-Tag: v2.5-beta3~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d11464cabc10d7c60c026c4a992e7156163043eb;p=ipfire-2.x.git Add backup include for cacti, rootfile update --- diff --git a/config/backup/includes/cacti b/config/backup/includes/cacti new file mode 100644 index 0000000000..b4268f8c88 --- /dev/null +++ b/config/backup/includes/cacti @@ -0,0 +1,2 @@ +/usr/share/cacti/rra/ + diff --git a/config/rootfiles/packages/cacti b/config/rootfiles/packages/cacti index 5115519d67..d72937a14c 100644 --- a/config/rootfiles/packages/cacti +++ b/config/rootfiles/packages/cacti @@ -1,6 +1,6 @@ etc/fcron.cyclic/cacti.cron etc/httpd/conf/vhosts.d/cacti.conf -usr/share/cacti +#usr/share/cacti #usr/share/cacti/LICENSE #usr/share/cacti/README usr/share/cacti/about.php @@ -8,7 +8,7 @@ usr/share/cacti/auth_changepassword.php usr/share/cacti/auth_login.php usr/share/cacti/cacti.sql usr/share/cacti/cdef.php -usr/share/cacti/cli +#usr/share/cacti/cli usr/share/cacti/cli/.htaccess usr/share/cacti/cli/add_data_query.php usr/share/cacti/cli/add_device.php @@ -159,7 +159,7 @@ usr/share/cacti/graphs_items.php usr/share/cacti/graphs_new.php usr/share/cacti/host.php usr/share/cacti/host_templates.php -usr/share/cacti/images +#usr/share/cacti/images usr/share/cacti/images/arrow.gif usr/share/cacti/images/auth_deny.gif usr/share/cacti/images/auth_login.gif @@ -221,7 +221,7 @@ 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/include +#usr/share/cacti/include usr/share/cacti/include/auth.php usr/share/cacti/include/bottom_footer.php usr/share/cacti/include/config.php @@ -230,10 +230,10 @@ 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/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 @@ -281,7 +281,7 @@ usr/share/cacti/include/layout.js usr/share/cacti/include/main.css 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 usr/share/cacti/include/treeview/ftiens4.js usr/share/cacti/include/treeview/ftiens4_export.js usr/share/cacti/include/treeview/ftv2blank.gif @@ -295,7 +295,7 @@ 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 #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 @@ -317,8 +317,8 @@ usr/share/cacti/install usr/share/cacti/install/index.php usr/share/cacti/install/install_finish.gif usr/share/cacti/install/install_next.gif -usr/share/cacti/lib -usr/share/cacti/lib/adodb +#usr/share/cacti/lib +#usr/share/cacti/lib/adodb usr/share/cacti/lib/adodb/adodb-csvlib.inc.php usr/share/cacti/lib/adodb/adodb-datadict.inc.php usr/share/cacti/lib/adodb/adodb-error.inc.php @@ -333,7 +333,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 +346,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 +387,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 @@ -443,34 +443,34 @@ 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 usr/share/cacti/log/.htaccess usr/share/cacti/log/cacti.log usr/share/cacti/logout.php usr/share/cacti/poller.php usr/share/cacti/poller_commands.php usr/share/cacti/poller_export.php -usr/share/cacti/resource -usr/share/cacti/resource/script_queries +#usr/share/cacti/resource +#usr/share/cacti/resource/script_queries usr/share/cacti/resource/script_queries/host_cpu.xml usr/share/cacti/resource/script_queries/host_disk.xml usr/share/cacti/resource/script_queries/unix_disk.xml usr/share/cacti/resource/script_server usr/share/cacti/resource/script_server/host_cpu.xml usr/share/cacti/resource/script_server/host_disk.xml -usr/share/cacti/resource/snmp_queries +#usr/share/cacti/resource/snmp_queries usr/share/cacti/resource/snmp_queries/host_disk.xml usr/share/cacti/resource/snmp_queries/interface.xml 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 +#usr/share/cacti/scripts usr/share/cacti/scripts/3com_cable_modem.pl usr/share/cacti/scripts/diskfree.pl usr/share/cacti/scripts/diskfree.sh @@ -497,3 +497,4 @@ usr/share/cacti/templates_import.php usr/share/cacti/tree.php usr/share/cacti/user_admin.php usr/share/cacti/utilities.php +var/ipfire/backup/addons/includes/cacti diff --git a/lfs/cacti b/lfs/cacti index 639dcf265a..45c1f65db9 100644 --- a/lfs/cacti +++ b/lfs/cacti @@ -81,12 +81,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf /usr/share/cacti mkdir /usr/share/cacti cd $(DIR_APP) && mv -vf * /usr/share/cacti - cp -vf $(DIR_SRC)/config/cacti/cacti.conf /etc/httpd/conf/vhosts.d/ - cp -vf $(DIR_SRC)/config/cacti/cacti.cron /etc/fcron.cyclic/ + cp -vf $(DIR_SRC)/config/cacti/cacti.conf /etc/httpd/conf/vhosts.d/ + install -v -m755 $(DIR_SRC)/config/cacti/cacti.cron /etc/fcron.cyclic/cacti.cron + install -v -m 644 $(DIR_SRC)/config/backup/includes/cacti \ + /var/ipfire/backup/addons/includes/cacti @rm -rf $(DIR_APP) @$(POSTBUILD) - - - - -