mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-06 13:06:11 +02:00
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
Conflicts: config/rootfiles/core/44/filelists/files
This commit is contained in:
Michael Tremer
@@ -3,7 +3,7 @@ etc/collectd.custom
|
||||
etc/collectd.precache
|
||||
etc/collectd.thermal
|
||||
etc/rc.d/rc0.d/K50collectd
|
||||
etc/rc.d/rc3.d/S21collectd
|
||||
etc/rc.d/rc3.d/S29collectd
|
||||
etc/rc.d/rc6.d/K50collectd
|
||||
#usr/bin/collectd-nagios
|
||||
#usr/etc/collectd.conf
|
||||
|
||||
@@ -20,79 +20,6 @@ usr/lib/squid/auth
|
||||
#usr/lib/squid/cachemgr.cgi
|
||||
usr/lib/squid/diskd
|
||||
#usr/lib/squid/errors
|
||||
#usr/lib/squid/errors.ipfire
|
||||
#usr/lib/squid/errors.ipfire/de
|
||||
usr/lib/squid/errors.ipfire/de/ERR_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/de/ERR_CACHE_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/de/ERR_CACHE_MGR_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/de/ERR_CANNOT_FORWARD
|
||||
usr/lib/squid/errors.ipfire/de/ERR_CONNECT_FAIL
|
||||
usr/lib/squid/errors.ipfire/de/ERR_DIR_LISTING
|
||||
usr/lib/squid/errors.ipfire/de/ERR_DNS_FAIL
|
||||
usr/lib/squid/errors.ipfire/de/ERR_ESI
|
||||
usr/lib/squid/errors.ipfire/de/ERR_FORWARDING_DENIED
|
||||
usr/lib/squid/errors.ipfire/de/ERR_FTP_DISABLED
|
||||
usr/lib/squid/errors.ipfire/de/ERR_FTP_FAILURE
|
||||
usr/lib/squid/errors.ipfire/de/ERR_FTP_FORBIDDEN
|
||||
usr/lib/squid/errors.ipfire/de/ERR_FTP_NOT_FOUND
|
||||
usr/lib/squid/errors.ipfire/de/ERR_FTP_PUT_CREATED
|
||||
usr/lib/squid/errors.ipfire/de/ERR_FTP_PUT_ERROR
|
||||
usr/lib/squid/errors.ipfire/de/ERR_FTP_PUT_MODIFIED
|
||||
usr/lib/squid/errors.ipfire/de/ERR_FTP_UNAVAILABLE
|
||||
usr/lib/squid/errors.ipfire/de/ERR_ICAP_FAILURE
|
||||
usr/lib/squid/errors.ipfire/de/ERR_INVALID_REQ
|
||||
usr/lib/squid/errors.ipfire/de/ERR_INVALID_RESP
|
||||
usr/lib/squid/errors.ipfire/de/ERR_INVALID_URL
|
||||
usr/lib/squid/errors.ipfire/de/ERR_LIFETIME_EXP
|
||||
usr/lib/squid/errors.ipfire/de/ERR_NO_RELAY
|
||||
usr/lib/squid/errors.ipfire/de/ERR_ONLY_IF_CACHED_MISS
|
||||
usr/lib/squid/errors.ipfire/de/ERR_READ_ERROR
|
||||
usr/lib/squid/errors.ipfire/de/ERR_READ_TIMEOUT
|
||||
usr/lib/squid/errors.ipfire/de/ERR_SECURE_CONNECT_FAIL
|
||||
usr/lib/squid/errors.ipfire/de/ERR_SHUTTING_DOWN
|
||||
usr/lib/squid/errors.ipfire/de/ERR_SOCKET_FAILURE
|
||||
usr/lib/squid/errors.ipfire/de/ERR_TOO_BIG
|
||||
usr/lib/squid/errors.ipfire/de/ERR_UNSUP_HTTPVERSION
|
||||
usr/lib/squid/errors.ipfire/de/ERR_UNSUP_REQ
|
||||
usr/lib/squid/errors.ipfire/de/ERR_URN_RESOLVE
|
||||
usr/lib/squid/errors.ipfire/de/ERR_WRITE_ERROR
|
||||
usr/lib/squid/errors.ipfire/de/ERR_ZERO_SIZE_OBJECT
|
||||
#usr/lib/squid/errors.ipfire/en
|
||||
usr/lib/squid/errors.ipfire/en/ERR_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/en/ERR_CACHE_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/en/ERR_CACHE_MGR_ACCESS_DENIED
|
||||
usr/lib/squid/errors.ipfire/en/ERR_CANNOT_FORWARD
|
||||
usr/lib/squid/errors.ipfire/en/ERR_CONNECT_FAIL
|
||||
usr/lib/squid/errors.ipfire/en/ERR_DIR_LISTING
|
||||
usr/lib/squid/errors.ipfire/en/ERR_DNS_FAIL
|
||||
usr/lib/squid/errors.ipfire/en/ERR_ESI
|
||||
usr/lib/squid/errors.ipfire/en/ERR_FORWARDING_DENIED
|
||||
usr/lib/squid/errors.ipfire/en/ERR_FTP_DISABLED
|
||||
usr/lib/squid/errors.ipfire/en/ERR_FTP_FAILURE
|
||||
usr/lib/squid/errors.ipfire/en/ERR_FTP_FORBIDDEN
|
||||
usr/lib/squid/errors.ipfire/en/ERR_FTP_NOT_FOUND
|
||||
usr/lib/squid/errors.ipfire/en/ERR_FTP_PUT_CREATED
|
||||
usr/lib/squid/errors.ipfire/en/ERR_FTP_PUT_ERROR
|
||||
usr/lib/squid/errors.ipfire/en/ERR_FTP_PUT_MODIFIED
|
||||
usr/lib/squid/errors.ipfire/en/ERR_FTP_UNAVAILABLE
|
||||
usr/lib/squid/errors.ipfire/en/ERR_ICAP_FAILURE
|
||||
usr/lib/squid/errors.ipfire/en/ERR_INVALID_REQ
|
||||
usr/lib/squid/errors.ipfire/en/ERR_INVALID_RESP
|
||||
usr/lib/squid/errors.ipfire/en/ERR_INVALID_URL
|
||||
usr/lib/squid/errors.ipfire/en/ERR_LIFETIME_EXP
|
||||
usr/lib/squid/errors.ipfire/en/ERR_NO_RELAY
|
||||
usr/lib/squid/errors.ipfire/en/ERR_ONLY_IF_CACHED_MISS
|
||||
usr/lib/squid/errors.ipfire/en/ERR_READ_ERROR
|
||||
usr/lib/squid/errors.ipfire/en/ERR_READ_TIMEOUT
|
||||
usr/lib/squid/errors.ipfire/en/ERR_SECURE_CONNECT_FAIL
|
||||
usr/lib/squid/errors.ipfire/en/ERR_SHUTTING_DOWN
|
||||
usr/lib/squid/errors.ipfire/en/ERR_SOCKET_FAILURE
|
||||
usr/lib/squid/errors.ipfire/en/ERR_TOO_BIG
|
||||
usr/lib/squid/errors.ipfire/en/ERR_UNSUP_HTTPVERSION
|
||||
usr/lib/squid/errors.ipfire/en/ERR_UNSUP_REQ
|
||||
usr/lib/squid/errors.ipfire/en/ERR_URN_RESOLVE
|
||||
usr/lib/squid/errors.ipfire/en/ERR_WRITE_ERROR
|
||||
usr/lib/squid/errors.ipfire/en/ERR_ZERO_SIZE_OBJECT
|
||||
#usr/lib/squid/errors/COPYRIGHT
|
||||
#usr/lib/squid/errors/TRANSLATORS
|
||||
#usr/lib/squid/errors/af
|
||||
@@ -516,41 +443,41 @@ usr/lib/squid/errors/en/ERR_ZERO_SIZE_OBJECT
|
||||
#usr/lib/squid/errors/es-sv
|
||||
#usr/lib/squid/errors/es-uy
|
||||
#usr/lib/squid/errors/es-ve
|
||||
#usr/lib/squid/errors/es/ERR_ACCESS_DENIED
|
||||
#usr/lib/squid/errors/es/ERR_CACHE_ACCESS_DENIED
|
||||
#usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
|
||||
#usr/lib/squid/errors/es/ERR_CANNOT_FORWARD
|
||||
#usr/lib/squid/errors/es/ERR_CONNECT_FAIL
|
||||
#usr/lib/squid/errors/es/ERR_DIR_LISTING
|
||||
#usr/lib/squid/errors/es/ERR_DNS_FAIL
|
||||
#usr/lib/squid/errors/es/ERR_ESI
|
||||
#usr/lib/squid/errors/es/ERR_FORWARDING_DENIED
|
||||
#usr/lib/squid/errors/es/ERR_FTP_DISABLED
|
||||
#usr/lib/squid/errors/es/ERR_FTP_FAILURE
|
||||
#usr/lib/squid/errors/es/ERR_FTP_FORBIDDEN
|
||||
#usr/lib/squid/errors/es/ERR_FTP_NOT_FOUND
|
||||
#usr/lib/squid/errors/es/ERR_FTP_PUT_CREATED
|
||||
#usr/lib/squid/errors/es/ERR_FTP_PUT_ERROR
|
||||
#usr/lib/squid/errors/es/ERR_FTP_PUT_MODIFIED
|
||||
#usr/lib/squid/errors/es/ERR_FTP_UNAVAILABLE
|
||||
#usr/lib/squid/errors/es/ERR_ICAP_FAILURE
|
||||
#usr/lib/squid/errors/es/ERR_INVALID_REQ
|
||||
#usr/lib/squid/errors/es/ERR_INVALID_RESP
|
||||
#usr/lib/squid/errors/es/ERR_INVALID_URL
|
||||
#usr/lib/squid/errors/es/ERR_LIFETIME_EXP
|
||||
#usr/lib/squid/errors/es/ERR_NO_RELAY
|
||||
#usr/lib/squid/errors/es/ERR_ONLY_IF_CACHED_MISS
|
||||
#usr/lib/squid/errors/es/ERR_READ_ERROR
|
||||
#usr/lib/squid/errors/es/ERR_READ_TIMEOUT
|
||||
#usr/lib/squid/errors/es/ERR_SECURE_CONNECT_FAIL
|
||||
#usr/lib/squid/errors/es/ERR_SHUTTING_DOWN
|
||||
#usr/lib/squid/errors/es/ERR_SOCKET_FAILURE
|
||||
#usr/lib/squid/errors/es/ERR_TOO_BIG
|
||||
#usr/lib/squid/errors/es/ERR_UNSUP_HTTPVERSION
|
||||
#usr/lib/squid/errors/es/ERR_UNSUP_REQ
|
||||
#usr/lib/squid/errors/es/ERR_URN_RESOLVE
|
||||
#usr/lib/squid/errors/es/ERR_WRITE_ERROR
|
||||
#usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
|
||||
usr/lib/squid/errors/es/ERR_ACCESS_DENIED
|
||||
usr/lib/squid/errors/es/ERR_CACHE_ACCESS_DENIED
|
||||
usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED
|
||||
usr/lib/squid/errors/es/ERR_CANNOT_FORWARD
|
||||
usr/lib/squid/errors/es/ERR_CONNECT_FAIL
|
||||
usr/lib/squid/errors/es/ERR_DIR_LISTING
|
||||
usr/lib/squid/errors/es/ERR_DNS_FAIL
|
||||
usr/lib/squid/errors/es/ERR_ESI
|
||||
usr/lib/squid/errors/es/ERR_FORWARDING_DENIED
|
||||
usr/lib/squid/errors/es/ERR_FTP_DISABLED
|
||||
usr/lib/squid/errors/es/ERR_FTP_FAILURE
|
||||
usr/lib/squid/errors/es/ERR_FTP_FORBIDDEN
|
||||
usr/lib/squid/errors/es/ERR_FTP_NOT_FOUND
|
||||
usr/lib/squid/errors/es/ERR_FTP_PUT_CREATED
|
||||
usr/lib/squid/errors/es/ERR_FTP_PUT_ERROR
|
||||
usr/lib/squid/errors/es/ERR_FTP_PUT_MODIFIED
|
||||
usr/lib/squid/errors/es/ERR_FTP_UNAVAILABLE
|
||||
usr/lib/squid/errors/es/ERR_ICAP_FAILURE
|
||||
usr/lib/squid/errors/es/ERR_INVALID_REQ
|
||||
usr/lib/squid/errors/es/ERR_INVALID_RESP
|
||||
usr/lib/squid/errors/es/ERR_INVALID_URL
|
||||
usr/lib/squid/errors/es/ERR_LIFETIME_EXP
|
||||
usr/lib/squid/errors/es/ERR_NO_RELAY
|
||||
usr/lib/squid/errors/es/ERR_ONLY_IF_CACHED_MISS
|
||||
usr/lib/squid/errors/es/ERR_READ_ERROR
|
||||
usr/lib/squid/errors/es/ERR_READ_TIMEOUT
|
||||
usr/lib/squid/errors/es/ERR_SECURE_CONNECT_FAIL
|
||||
usr/lib/squid/errors/es/ERR_SHUTTING_DOWN
|
||||
usr/lib/squid/errors/es/ERR_SOCKET_FAILURE
|
||||
usr/lib/squid/errors/es/ERR_TOO_BIG
|
||||
usr/lib/squid/errors/es/ERR_UNSUP_HTTPVERSION
|
||||
usr/lib/squid/errors/es/ERR_UNSUP_REQ
|
||||
usr/lib/squid/errors/es/ERR_URN_RESOLVE
|
||||
usr/lib/squid/errors/es/ERR_WRITE_ERROR
|
||||
usr/lib/squid/errors/es/ERR_ZERO_SIZE_OBJECT
|
||||
#usr/lib/squid/errors/et
|
||||
#usr/lib/squid/errors/et-ee
|
||||
#usr/lib/squid/errors/et/ERR_ACCESS_DENIED
|
||||
@@ -670,41 +597,41 @@ usr/lib/squid/errors/en/ERR_ZERO_SIZE_OBJECT
|
||||
#usr/lib/squid/errors/fr-fr
|
||||
#usr/lib/squid/errors/fr-lu
|
||||
#usr/lib/squid/errors/fr-mc
|
||||
#usr/lib/squid/errors/fr/ERR_ACCESS_DENIED
|
||||
#usr/lib/squid/errors/fr/ERR_CACHE_ACCESS_DENIED
|
||||
#usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
|
||||
#usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD
|
||||
#usr/lib/squid/errors/fr/ERR_CONNECT_FAIL
|
||||
#usr/lib/squid/errors/fr/ERR_DIR_LISTING
|
||||
#usr/lib/squid/errors/fr/ERR_DNS_FAIL
|
||||
#usr/lib/squid/errors/fr/ERR_ESI
|
||||
#usr/lib/squid/errors/fr/ERR_FORWARDING_DENIED
|
||||
#usr/lib/squid/errors/fr/ERR_FTP_DISABLED
|
||||
#usr/lib/squid/errors/fr/ERR_FTP_FAILURE
|
||||
#usr/lib/squid/errors/fr/ERR_FTP_FORBIDDEN
|
||||
#usr/lib/squid/errors/fr/ERR_FTP_NOT_FOUND
|
||||
#usr/lib/squid/errors/fr/ERR_FTP_PUT_CREATED
|
||||
#usr/lib/squid/errors/fr/ERR_FTP_PUT_ERROR
|
||||
#usr/lib/squid/errors/fr/ERR_FTP_PUT_MODIFIED
|
||||
#usr/lib/squid/errors/fr/ERR_FTP_UNAVAILABLE
|
||||
#usr/lib/squid/errors/fr/ERR_ICAP_FAILURE
|
||||
#usr/lib/squid/errors/fr/ERR_INVALID_REQ
|
||||
#usr/lib/squid/errors/fr/ERR_INVALID_RESP
|
||||
#usr/lib/squid/errors/fr/ERR_INVALID_URL
|
||||
#usr/lib/squid/errors/fr/ERR_LIFETIME_EXP
|
||||
#usr/lib/squid/errors/fr/ERR_NO_RELAY
|
||||
#usr/lib/squid/errors/fr/ERR_ONLY_IF_CACHED_MISS
|
||||
#usr/lib/squid/errors/fr/ERR_READ_ERROR
|
||||
#usr/lib/squid/errors/fr/ERR_READ_TIMEOUT
|
||||
#usr/lib/squid/errors/fr/ERR_SECURE_CONNECT_FAIL
|
||||
#usr/lib/squid/errors/fr/ERR_SHUTTING_DOWN
|
||||
#usr/lib/squid/errors/fr/ERR_SOCKET_FAILURE
|
||||
#usr/lib/squid/errors/fr/ERR_TOO_BIG
|
||||
#usr/lib/squid/errors/fr/ERR_UNSUP_HTTPVERSION
|
||||
#usr/lib/squid/errors/fr/ERR_UNSUP_REQ
|
||||
#usr/lib/squid/errors/fr/ERR_URN_RESOLVE
|
||||
#usr/lib/squid/errors/fr/ERR_WRITE_ERROR
|
||||
#usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
|
||||
usr/lib/squid/errors/fr/ERR_ACCESS_DENIED
|
||||
usr/lib/squid/errors/fr/ERR_CACHE_ACCESS_DENIED
|
||||
usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED
|
||||
usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD
|
||||
usr/lib/squid/errors/fr/ERR_CONNECT_FAIL
|
||||
usr/lib/squid/errors/fr/ERR_DIR_LISTING
|
||||
usr/lib/squid/errors/fr/ERR_DNS_FAIL
|
||||
usr/lib/squid/errors/fr/ERR_ESI
|
||||
usr/lib/squid/errors/fr/ERR_FORWARDING_DENIED
|
||||
usr/lib/squid/errors/fr/ERR_FTP_DISABLED
|
||||
usr/lib/squid/errors/fr/ERR_FTP_FAILURE
|
||||
usr/lib/squid/errors/fr/ERR_FTP_FORBIDDEN
|
||||
usr/lib/squid/errors/fr/ERR_FTP_NOT_FOUND
|
||||
usr/lib/squid/errors/fr/ERR_FTP_PUT_CREATED
|
||||
usr/lib/squid/errors/fr/ERR_FTP_PUT_ERROR
|
||||
usr/lib/squid/errors/fr/ERR_FTP_PUT_MODIFIED
|
||||
usr/lib/squid/errors/fr/ERR_FTP_UNAVAILABLE
|
||||
usr/lib/squid/errors/fr/ERR_ICAP_FAILURE
|
||||
usr/lib/squid/errors/fr/ERR_INVALID_REQ
|
||||
usr/lib/squid/errors/fr/ERR_INVALID_RESP
|
||||
usr/lib/squid/errors/fr/ERR_INVALID_URL
|
||||
usr/lib/squid/errors/fr/ERR_LIFETIME_EXP
|
||||
usr/lib/squid/errors/fr/ERR_NO_RELAY
|
||||
usr/lib/squid/errors/fr/ERR_ONLY_IF_CACHED_MISS
|
||||
usr/lib/squid/errors/fr/ERR_READ_ERROR
|
||||
usr/lib/squid/errors/fr/ERR_READ_TIMEOUT
|
||||
usr/lib/squid/errors/fr/ERR_SECURE_CONNECT_FAIL
|
||||
usr/lib/squid/errors/fr/ERR_SHUTTING_DOWN
|
||||
usr/lib/squid/errors/fr/ERR_SOCKET_FAILURE
|
||||
usr/lib/squid/errors/fr/ERR_TOO_BIG
|
||||
usr/lib/squid/errors/fr/ERR_UNSUP_HTTPVERSION
|
||||
usr/lib/squid/errors/fr/ERR_UNSUP_REQ
|
||||
usr/lib/squid/errors/fr/ERR_URN_RESOLVE
|
||||
usr/lib/squid/errors/fr/ERR_WRITE_ERROR
|
||||
usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT
|
||||
#usr/lib/squid/errors/he
|
||||
#usr/lib/squid/errors/he-il
|
||||
#usr/lib/squid/errors/he/ERR_ACCESS_DENIED
|
||||
@@ -1724,6 +1651,8 @@ usr/sbin/updxlrator
|
||||
#usr/share/man/man8/squid_ldap_group.8
|
||||
#usr/share/man/man8/squid_session.8
|
||||
#usr/share/man/man8/squid_unix_group.8
|
||||
var/ipfire/proxy/errorpage-ipfire.css
|
||||
var/ipfire/proxy/errorpage-squid.css
|
||||
var/ipfire/updatexlrator/autocheck/cron.daily
|
||||
var/ipfire/updatexlrator/autocheck/cron.monthly
|
||||
var/ipfire/updatexlrator/autocheck/cron.weekly
|
||||
|
||||
@@ -40,6 +40,7 @@ var/ipfire/langs/fr.pl
|
||||
var/ipfire/langs/es.pl
|
||||
var/ipfire/menu.d/10-system.menu
|
||||
usr/local/bin/fireinfoctrl
|
||||
var/ipfire/qos/bin/makeqosscripts.pl
|
||||
usr/local/bin/timectrl
|
||||
usr/local/bin/rebuild-initrd
|
||||
usr/local/bin/scanhd
|
||||
|
||||
@@ -103,6 +103,12 @@ echo Unpack the updated files ...
|
||||
tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
|
||||
--no-overwrite-dir
|
||||
|
||||
#
|
||||
# Change collectd init symlinks
|
||||
#
|
||||
rm -f /etc/rc.d/rc3.d/S21collectd
|
||||
ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd
|
||||
|
||||
# Remove old pakfire cronjob.
|
||||
rm -f /etc/fcron.daily/pakfire-update
|
||||
|
||||
@@ -204,6 +210,15 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
|
||||
/etc/init.d/ipsec start
|
||||
fi
|
||||
|
||||
#
|
||||
# Rebuild qosscript if enabled
|
||||
#
|
||||
if [ -e /var/ipfire/qos/enable ]; then
|
||||
/usr/local/bin/qosctrl stop
|
||||
/usr/local/bin/qosctrl generate
|
||||
/usr/local/bin/qosctrl start
|
||||
fi
|
||||
|
||||
# Add pakfire and fireinfo cronjobs...
|
||||
grep -v "# fireinfo" /var/spool/cron/root.orig |
|
||||
grep -v "/usr/bin/sendprofile" |
|
||||
|
||||
Reference in New Issue
Block a user