mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-26 19:00:34 +02:00
Merge remote-tracking branch 'origin/next'
This commit is contained in:
Arne Fitzenreiter
@@ -34,7 +34,6 @@ etc/rc.d/init.d/functions
|
||||
#etc/rc.d/init.d/gnump3d
|
||||
etc/rc.d/init.d/halt
|
||||
#etc/rc.d/init.d/hostapd
|
||||
#etc/rc.d/init.d/icecream
|
||||
#etc/rc.d/init.d/imspector
|
||||
etc/rc.d/init.d/ipsec
|
||||
#etc/rc.d/init.d/keepalived
|
||||
|
||||
@@ -36,7 +36,6 @@ etc/rc.d/init.d/functions
|
||||
#etc/rc.d/init.d/gnump3d
|
||||
etc/rc.d/init.d/halt
|
||||
#etc/rc.d/init.d/hostapd
|
||||
#etc/rc.d/init.d/icecream
|
||||
#etc/rc.d/init.d/imspector
|
||||
etc/rc.d/init.d/ipsec
|
||||
#etc/rc.d/init.d/keepalived
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
bin/ping
|
||||
#usr/bin/ftp
|
||||
#usr/bin/rcp
|
||||
#usr/bin/rlogin
|
||||
#usr/bin/rsh
|
||||
#usr/bin/talk
|
||||
#usr/bin/tftp
|
||||
#usr/sbin/ftpd
|
||||
#usr/sbin/inetd
|
||||
#usr/sbin/rexecd
|
||||
#usr/sbin/rlogind
|
||||
#usr/sbin/rshd
|
||||
#usr/sbin/talkd
|
||||
#usr/sbin/tftpd
|
||||
#usr/sbin/uucpd
|
||||
#usr/share/info/inetutils.info
|
||||
#usr/share/info/inetutils.info-1
|
||||
#usr/share/info/inetutils.info-2
|
||||
#usr/share/info/inetutils.info-3
|
||||
#usr/share/man/man1/ftp.1
|
||||
#usr/share/man/man1/logger.1
|
||||
#usr/share/man/man1/rcp.1
|
||||
#usr/share/man/man1/rlogin.1
|
||||
#usr/share/man/man1/rsh.1
|
||||
#usr/share/man/man1/talk.1
|
||||
#usr/share/man/man1/telnet.1
|
||||
#usr/share/man/man1/tftp.1
|
||||
#usr/share/man/man5/syslog.conf.5
|
||||
#usr/share/man/man8/ftpd.8
|
||||
#usr/share/man/man8/inetd.8
|
||||
#usr/share/man/man8/ping.8
|
||||
#usr/share/man/man8/rexecd.8
|
||||
#usr/share/man/man8/rlogind.8
|
||||
#usr/share/man/man8/rshd.8
|
||||
#usr/share/man/man8/syslogd.8
|
||||
#usr/share/man/man8/talkd.8
|
||||
#usr/share/man/man8/telnetd.8
|
||||
#usr/share/man/man8/tftpd.8
|
||||
@@ -1 +1,2 @@
|
||||
bin/ping
|
||||
usr/bin/ping
|
||||
|
||||
@@ -9,6 +9,9 @@ srv/web/ipfire/cgi-bin/modem-status.cgi
|
||||
srv/web/ipfire/cgi-bin/ovpnmain.cgi
|
||||
srv/web/ipfire/cgi-bin/proxy.cgi
|
||||
srv/web/ipfire/html/themes/ipfire/include/functions.pl
|
||||
usr/bin/squidGuard
|
||||
usr/sbin/redirect_wrapper
|
||||
usr/sbin/updxlrator
|
||||
usr/local/bin/setddns.pl
|
||||
var/ipfire/langs
|
||||
var/ipfire/menu.d/20-status.menu
|
||||
|
||||
@@ -165,6 +165,10 @@ if [ $BOOTSPACE -lt 1000 ]; then
|
||||
esac
|
||||
fi
|
||||
|
||||
# Update ping
|
||||
rm -f /bin/ping
|
||||
ln -sf ../usr/bin/ping /bin/ping
|
||||
chmod 4755 /usr/bin/ping
|
||||
|
||||
# Update Language cache
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
@@ -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
|
||||
@@ -27,6 +29,7 @@ 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
|
||||
@@ -191,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
|
||||
@@ -222,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
|
||||
@@ -231,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
|
||||
@@ -280,20 +308,9 @@ 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
|
||||
@@ -318,6 +335,10 @@ 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
|
||||
@@ -338,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
|
||||
@@ -351,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
|
||||
@@ -392,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
|
||||
@@ -437,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
|
||||
@@ -450,6 +472,9 @@ usr/share/cacti/lib/variables.php
|
||||
usr/share/cacti/lib/xml.php
|
||||
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
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
#opt/icecream
|
||||
#opt/icecream/bin
|
||||
#opt/icecream/bin/c++
|
||||
#opt/icecream/bin/cc
|
||||
#opt/icecream/bin/g++
|
||||
#opt/icecream/bin/gcc
|
||||
#opt/icecream/bin/icecc
|
||||
#opt/icecream/bin/icerun
|
||||
#opt/icecream/include
|
||||
#opt/icecream/include/icecc
|
||||
#opt/icecream/include/icecc/comm.h
|
||||
#opt/icecream/include/icecc/job.h
|
||||
#opt/icecream/lib
|
||||
#opt/icecream/lib/icecc
|
||||
#opt/icecream/lib/icecc/icecc-create-env
|
||||
#opt/icecream/lib/libicecc.a
|
||||
#opt/icecream/lib/libicecc.la
|
||||
#opt/icecream/lib/pkgconfig
|
||||
#opt/icecream/lib/pkgconfig/icecc.pc
|
||||
#opt/icecream/sbin
|
||||
opt/icecream/sbin/icecc-scheduler
|
||||
opt/icecream/sbin/iceccd
|
||||
etc/rc.d/init.d/icecream
|
||||
2369
config/rootfiles/packages/icinga
Normal file
2369
config/rootfiles/packages/icinga
Normal file
File diff suppressed because it is too large
Load Diff
4
config/rootfiles/packages/vdr_vnsiserver5
Normal file
4
config/rootfiles/packages/vdr_vnsiserver5
Normal file
@@ -0,0 +1,4 @@
|
||||
etc/sysconfig/vdr-plugins.d/vnsiserver5.conf
|
||||
etc/vdr/plugins/vnsiserver5
|
||||
etc/vdr/plugins/vnsiserver5/allowed_hosts.conf
|
||||
usr/lib/vdr/libvdr-vnsiserver5.so.2.0.0
|
||||
Reference in New Issue
Block a user