webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-01-19 19:27:22 +01:00
parent b7e680f2eb 8dbba0e460
commit fdcfde0a2e
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/45/filelists/files
View File

@@ -5,3 +5,4 @@ srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/sbin/updxlrator

4
config/rootfiles/core/45/update.sh
View File

@@ -26,6 +26,8 @@
#
#Stop services
echo Stopping Proxy
/etc/init.d/squid stop 2>/dev/null
#
#Extract files
@@ -33,6 +35,8 @@ extract_files
#
#Start services
echo Starting Proxy
/etc/init.d/squid start 2>/dev/null
#
#Update Language cache

11
config/updxlrator/updxlrator
View File

@@ -101,7 +101,10 @@ while (<>) {
# Section: Linux Downloads
# -----------------------------------------------------------
if ($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i)
if (
($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i) ||
($source_url =~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i)
)
{
$xlrator_url = &check_cache($source_url,$hostaddr,$username,"Linux",$mirror);
}
@@ -157,7 +160,11 @@ while (<>) {
# Section: Avira Downloads
# -----------------------------------------------------------
if ($source_url =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i)
if (
($source_url =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i) ||
($source_url =~ m@^http://80.190.130.19[4-5]/update/.*\.(htm|html|gz)$@i) ||
($source_url =~ m@^http://62.146.64.14[6-7]/update/.*\.(htm|html|gz)$@i)
)
{
$xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avira",$mirror);
}