From 73c7eff80ece6765c5c147514a3ce2153f7bf4c8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 19 Jan 2011 17:47:56 +0100 Subject: [PATCH] Remove some httpd errorlog entries. --- config/rootfiles/core/45/filelists/files | 5 ++++- html/cgi-bin/connections.cgi | 4 ++-- html/cgi-bin/index.cgi | 2 +- html/cgi-bin/pppsetup.cgi | 4 ++-- html/cgi-bin/proxy.cgi | 2 +- html/cgi-bin/vpnmain.cgi | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files index 46d3991053..afefcadb05 100644 --- a/config/rootfiles/core/45/filelists/files +++ b/config/rootfiles/core/45/filelists/files @@ -1,4 +1,7 @@ etc/system-release etc/issue +srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/proxy.cgi \ No newline at end of file +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 7b53c009ec..14ee209105 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # 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,7 +57,7 @@ if (open(IP, "${General::swroot}/red/local-ipaddress")) { 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) { chomp($route); my @temp = split(/[\t ]+/, $route); diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 45b0fd74c8..8e623c96af 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -431,7 +431,7 @@ foreach my $line (@df) { } # 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) { chomp ($file); my $disk=`echo $file | cut -d"-" -f2`; diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 0bfeabd1b2..e2af0a0887 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # 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 # @@ -486,7 +486,7 @@ print </dev/null | grep 0`; chomp ($atmdev); if ($atmdev ne '') { print < # +# Copyright (C) 2007-2011 IPFire Team # # # # 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 # diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f336ec610a..55582952b5 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # 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 # # 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); $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 if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") { -- 2.39.2