Revision: 6125
http://ipcop.svn.sourceforge.net/ipcop/?rev=6125&view=rev
Author: owes
Date: 2011-11-22 15:48:53 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Disable high detail for traffic accounting. Does not work reliably at the
moment. Maybe things improve when ulogd2 becomes available.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/trafficadm.cgi
ipcop/trunk/src/scripts/upgrade.sh
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
ipcop/trunk/updates/2.0.3/setup
Modified: ipcop/trunk/html/cgi-bin/trafficadm.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/trafficadm.cgi 2011-11-22 12:05:41 UTC (rev
6124)
+++ ipcop/trunk/html/cgi-bin/trafficadm.cgi 2011-11-22 15:48:53 UTC (rev
6125)
@@ -13,9 +13,10 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
+# (c) 2008-2011, the IPCop team
+#
# $Id$
#
@@ -229,7 +230,7 @@
<td>
<select name='DETAIL_LEVEL'>
<option value='Low'
$selected{'DETAIL_LEVEL'}{'Low'}>$Lang::tr{'low'}</option>
- <option value='High'
$selected{'DETAIL_LEVEL'}{'High'}>$Lang::tr{'high'}</option>
+ <option value='High' $selected{'DETAIL_LEVEL'}{'High'}
disabled='disabled'>$Lang::tr{'high'}</option>
</select>
</td>
<td colspan='2'> </td>
Modified: ipcop/trunk/src/scripts/upgrade.sh
===================================================================
--- ipcop/trunk/src/scripts/upgrade.sh 2011-11-22 12:05:41 UTC (rev 6124)
+++ ipcop/trunk/src/scripts/upgrade.sh 2011-11-22 15:48:53 UTC (rev 6125)
@@ -1,6 +1,20 @@
#!/bin/bash
#
# This file is part of the IPCop Firewall.
+#
+# IPCop 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 2 of the License, or
+# (at your option) any later version.
+#
+# IPCop 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 IPCop. If not, see <http://www.gnu.org/licenses/>.
+#
# (c) Gilles Espinasse
#
# Universal upgrade script
@@ -75,3 +89,6 @@
# External access rules no longer possible as INPUT rule, modified in 1.9.18
/bin/sed -i -e "/,INPUT,.*,defaultSrcNet,Red,/{s/,INPUT,/,EXTERNAL,/}"
/var/ipcop/firewall/config
+
+# Detail High for traffic accounting disabled in 2.0.3
+/bin/sed -i -e "s/DETAIL_LEVEL=.*/DETAIL_LEVEL=Low/"
/var/ipcop/traffic/settings
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-22 12:05:41 UTC
(rev 6124)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-22 15:48:53 UTC
(rev 6125)
@@ -1,6 +1,8 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/home/httpd/cgi-bin/trafficadm.cgi
/home/httpd/cgi-bin/urlfilter.cgi
/home/httpd/vhost81/cgi-bin/redirect.cgi
+/usr/local/bin/upgrade.sh
##
## acpid-2.0.13
/usr/sbin/acpid
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-22 12:05:41 UTC (rev
6124)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-22 15:48:53 UTC (rev
6125)
@@ -4,6 +4,7 @@
<releasedate>2011-mm-dd</releasedate>
<size>0</size>
<description>Add again capi4k-utils plugins.<br />
+ Disable traffic accounting with detail level High, always use
Low.<br />
Fix _builtin___strncat_chk might overflow in
usb-modemswitch-1.2.0.<br />
Upgrade acpid to 2.0.13, kbd to 1.15.3, Solos PCI to 1.03.
</description>
Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup 2011-11-22 12:05:41 UTC (rev 6124)
+++ ipcop/trunk/updates/2.0.3/setup 2011-11-22 15:48:53 UTC (rev 6125)
@@ -59,7 +59,7 @@
# /sbin/mkinitramfs --with-kernel=2.6.32-2 --with-firmware --many-modules
--with-list=/etc/modules.initramfs
# Adjust the changed config files
-# /usr/local/bin/upgrade.sh
+/usr/local/bin/upgrade.sh
# Remove old libraries (version specific)
# /bin/rm -f .....
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
