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

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

Browse Source
This commit is contained in:
Michael Tremer
2011-01-19 19:29:52 +01:00
parent ee7b74d483 8dbba0e460
commit 551bddaefe
8 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,8 @@
etc/system-release etc/system-release
etc/issue etc/issue
srv/web/ipfire/cgi-bin/connections.cgi
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/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 #Stop services
echo Stopping Proxy
/etc/init.d/squid stop 2>/dev/null
# #
#Extract files #Extract files
@@ -33,6 +35,8 @@ extract_files
# #
#Start services #Start services
echo Starting Proxy
/etc/init.d/squid start 2>/dev/null
# #
#Update Language cache #Update Language cache

11
config/updxlrator/updxlrator
View File

@@ -101,7 +101,10 @@ while (<>) {
# Section: Linux Downloads # 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); $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Linux",$mirror);
} }
@@ -157,7 +160,11 @@ while (<>) {
# Section: Avira Downloads # 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); $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avira",$mirror);
} }

4
html/cgi-bin/connections.cgi
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt # # Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -57,7 +57,7 @@ if (open(IP, "${General::swroot}/red/local-ipaddress")) {
push(@colour, ${Header::colourfw} ); push(@colour, ${Header::colourfw} );
} }
my @vpn = `/usr/local/bin/ipsecctrl I|grep erouted|cut -d"]" -f3|cut -d"=" -f4|cut -d";" -f1| sed "s|/| |g"`; my @vpn = `/usr/local/bin/ipsecctrl I 2>/dev/null|grep erouted|cut -d"]" -f3|cut -d"=" -f4|cut -d";" -f1| sed "s|/| |g"`;
foreach my $route (@vpn) { foreach my $route (@vpn) {
chomp($route); chomp($route);
my @temp = split(/[\t ]+/, $route); my @temp = split(/[\t ]+/, $route);

6
html/cgi-bin/index.cgi
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -58,7 +58,7 @@ my %mainsettings = ();
my $connstate = &Header::connectionstatus(); my $connstate = &Header::connectionstatus();
if ( -e "/var/ipfire/main/gpl-acceted" ) { if ( -e "/var/ipfire/main/gpl-accepted" ) {
if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) { if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'} || $cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
$refresh = "<meta http-equiv='refresh' content='300;'>"; $refresh = "<meta http-equiv='refresh' content='300;'>";
} elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ } elsif ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){
@@ -431,7 +431,7 @@ foreach my $line (@df) {
} }
# S.M.A.R.T. health warning # S.M.A.R.T. health warning
my @files = `/bin/ls /var/run/smartctl_out_hddtemp-*`; my @files = `/bin/ls /var/run/smartctl_out_hddtemp-* 2>/dev/null`;
foreach my $file (@files) { foreach my $file (@files) {
chomp ($file); chomp ($file);
my $disk=`echo $file | cut -d"-" -f2`; my $disk=`echo $file | cut -d"-" -f2`;

4
html/cgi-bin/pppsetup.cgi
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt # # Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -486,7 +486,7 @@ print <<END
END END
; ;
my $atmdev=`cat /proc/net/atm/devices | grep 0`; my $atmdev=`cat /proc/net/atm/devices 2>/dev/null | grep 0`;
chomp ($atmdev); chomp ($atmdev);
if ($atmdev ne '') { if ($atmdev ne '') {
print <<END print <<END

2
html/cgi-bin/proxy.cgi
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> # # Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #

4
html/cgi-bin/vpnmain.cgi
View File

@@ -2,7 +2,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007-2010 IPFire Team info@ipfire.org # # Copyright (C) 2007-2011 IPFire Team info@ipfire.org #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -2400,7 +2400,7 @@ EOF
&General::readhasharray("${General::swroot}/vpn/config", \%confighash); &General::readhasharray("${General::swroot}/vpn/config", \%confighash);
$cgiparams{'CA_NAME'} = ''; $cgiparams{'CA_NAME'} = '';
my @status = `/usr/local/bin/ipsecctrl I`; my @status = `/usr/local/bin/ipsecctrl I 2>/dev/null`;
# suggest a default name for this side # suggest a default name for this side
if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") { if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") {