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

remove more bogus logentries.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-01-22 18:54:31 +01:00
parent 0a3c4cf02b
commit 324bb8881f
7 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,17 @@
etc/system-release
etc/issue
etc/rc.d/init.d/functions
srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/fireinfo.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/pakfire.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
var/ipfire/outgoing/bin/outgoingfw.pl
srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
usr/local/bin/makegraphs
usr/local/bin/hddshutdown
usr/local/bin/vpn-watch

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

@@ -152,7 +152,7 @@ print <<END;
</tr>
<tr>
<!-- spacer -->
<td colspan="2">&nbsp;</td>
<td colspan="2"><font color='$Header::colourgreen'>&nbsp;</font></td>
</tr>
<tr>
<td colspan='2'>

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

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2005-2010 IPFire Team #
# Copyright (C) 2005-2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -97,7 +97,7 @@ if (-e "/etc/snort/snort.conf") {
close(FILE);
open(FILE, ">/etc/snort/snort.conf") or die 'Unable to write snort config file.';
my @rules = `cd /etc/snort/rules/ && ls *.rules`; # With this loop the rule might be display with correct rulepath set
my @rules = `cd /etc/snort/rules/ && ls *.rules 2>/dev/null`; # With this loop the rule might be display with correct rulepath set
foreach (@rules) {
chomp $_;
my $temp = join(";",@snortconfig);

10
html/cgi-bin/pakfire.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -57,12 +57,6 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont
&Header::openpage($Lang::tr{'pakfire configuration'}, 1);
&Header::openbigbox('100%', 'left', '', $errormessage);
# check if reboot is necessary
my $reboot = 0;
if (`find /var/run/need_reboot 2>/dev/null`) {
$reboot = 1;
}
if ($pakfiresettings{'ACTION'} eq 'install'){
$pakfiresettings{'INSPAKS'} =~ s/\|/\ /g;
if ("$pakfiresettings{'FORCE'}" eq "on") {
@@ -236,7 +230,7 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db"
print <<END;
<table width='95%' cellpadding='5' >
END
if ($reboot == 1) {
if ( -e "/var/run/need_reboot") {
print "<tr><td align='center' colspan='2'><font color='red'>$Lang::tr{'needreboot'}!</font></td></tr>";
print "<tr><td colspan='2'>&nbsp;</font></td></tr>"
}

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

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2005-2010 IPTifre Team #
# Copyright (C) 2005-2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -242,7 +242,7 @@ $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
$selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
$selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel`;
my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel 2>/dev/null`;
# get available channels
my @temp;
@@ -253,7 +253,7 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);}
}
my @channellist = @temp;
my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower`;
my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower 2>/dev/null`;
# get available channels
my @temp;

2
src/initscripts/init.d/functions
View File

@@ -27,7 +27,7 @@ KILLDELAY="10"
## Screen Dimensions
# Find current screen size
if [ -z "${COLUMNS}" ]; then
COLUMNS=$(stty size)
COLUMNS=$(stty size 2>/dev/null)
COLUMNS=${COLUMNS##* }
fi

27
src/scripts/hddshutdown
View File

@@ -1,13 +1,26 @@
#!/usr/bin/perl
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
#
# IPFire HDD Shutdown state reader
#
# This code is distributed under the terms of the GPL
#
# 18.09.2007 Maniacikarus - IPFire.org - maniacikarus@ipfire.org
# 22.09.2007 Arne_F - fitzenreiter.de - arne@fitzenreiter.de
# begin
my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
my $diskstats = "";
@@ -20,7 +33,7 @@ if ($debug){print "### Searching for available Disks ###\n";}
foreach (@devices){
chomp $_;
my @array = split(/\//,$_);
$diskstats = `cat /var/run/hddstats-$array[$#array]`;
$diskstats = `cat /var/run/hddstats-$array[$#array] 2>/dev/null`;
chomp $diskstats;
$newdiskstats = `iostat -d -t $_ | tail -2 | head -1 | awk '{ print \$5","\$6}'`;
chomp $newdiskstats;