[prev in list] [next in list] [prev in thread] [next in thread]
List: ipcop-svn
Subject: [Ipcop-svn] SF.net SVN: ipcop:[2022] ipcop/trunk
From: owes () users ! sourceforge ! net
Date: 2008-10-27 6:22:28
Message-ID: E1KuLUi-0001FT-P0 () c3vjzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 2022
http://ipcop.svn.sourceforge.net/ipcop/?rev=2022&view=rev
Author: owes
Date: 2008-10-27 06:22:28 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
Drop vnstat. IP accounting to be done by using ulogd/sqlite.
Modified Paths:
--------------
ipcop/trunk/config/cron/crontab
ipcop/trunk/doc/Packages-monitoring-urls
ipcop/trunk/make.sh
ipcop/trunk/src/rc.d/rc.netaddress.up
ipcop/trunk/src/rc.d/rc.updatered
Removed Paths:
-------------
ipcop/trunk/config/rootfiles/common/vnstat
ipcop/trunk/lfs/vnstat
Modified: ipcop/trunk/config/cron/crontab
===================================================================
--- ipcop/trunk/config/cron/crontab 2008-10-27 05:55:09 UTC (rev 2021)
+++ ipcop/trunk/config/cron/crontab 2008-10-27 06:22:28 UTC (rev 2022)
@@ -17,9 +17,6 @@
# Backup logs to flashdisk
30 * * * * /etc/rc.d/rc.flash.down
-# network traffic
-*/5 * * * * /usr/bin/vnstat --update
-
# Make some nice graphs
*/5 * * * * /usr/local/bin/makegraphs >/dev/null
Deleted: ipcop/trunk/config/rootfiles/common/vnstat
===================================================================
--- ipcop/trunk/config/rootfiles/common/vnstat 2008-10-27 05:55:09 UTC (rev 2021)
+++ ipcop/trunk/config/rootfiles/common/vnstat 2008-10-27 06:22:28 UTC (rev 2022)
@@ -1,5 +0,0 @@
-## vnstat-1.6
-##
-etc/vnstat.conf
-usr/bin/vnstat
-var/log/vnstat
Modified: ipcop/trunk/doc/Packages-monitoring-urls
===================================================================
--- ipcop/trunk/doc/Packages-monitoring-urls 2008-10-27 05:55:09 UTC (rev 2021)
+++ ipcop/trunk/doc/Packages-monitoring-urls 2008-10-27 06:22:28 UTC (rev 2022)
@@ -105,7 +105,6 @@
iana-etc http://freshmeat.net/projects/iana-etc/
iftop http://www.ex-parrot.com/~pdw/iftop http://freshmeat.net/projects/iftop is \
late inetutils http://freshmeat.net/projects/inetutils
-ipac-ng http://sourceforge.net/project/filemodule_monitor.php?filemodule_id=20383
iproute2 (1/3)Check: \
http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.20-070313.tar.gz \
iptables https://lists.netfilter.org/mailman/listinfo/netfilter-announce \
iptstate http://sourceforge.net/project/filemodule_monitor.php?filemodule_id=46961 \
@@ -217,7 +216,6 @@ \
util-linux-ng http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git \
http://vger.kernel.org/vger-lists.html#util-linux-ng (no announce list) \
vim http://freshmeat.net/projects/vim/ vlan http://freshmeat.net/projects/vlan/
-vnstat http://freshmeat.net/projects/vnstat/
wanpipe (1/3)Check: ftp://ftp.sangoma.com/linux/current_wanpipe/wanpipe-2.3.4-3.tgz
which http://www.xs4all.nl/~carlo17/which/
wireless_tools (1/3)Check: \
http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.28.tar.gz @@ \
-237,3 +235,8 @@ Packages announced on \
http://mail.gnome.org/mailman/listinfo/gnome-announce-list glib
pango
+
+
+No longer used:
+ipac-ng http://sourceforge.net/project/filemodule_monitor.php?filemodule_id=20383
+vnstat http://freshmeat.net/projects/vnstat/
Deleted: ipcop/trunk/lfs/vnstat
===================================================================
--- ipcop/trunk/lfs/vnstat 2008-10-27 05:55:09 UTC (rev 2021)
+++ ipcop/trunk/lfs/vnstat 2008-10-27 06:22:28 UTC (rev 2022)
@@ -1,94 +0,0 @@
-###############################################################################
-# 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, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Makefiles are based on LFSMake, which is #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
-# #
-# Modifications by: #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
-# - Modified Makefile for IPCop build #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = vnstat
-VER = 1.6
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = http://humdi.net/vnstat
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = ccaffe8e70d47e0cf2f25e52daa25712
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
- cd $(DIR_APP) && make
- cd $(DIR_APP) && install -s -m 755 src/vnstat /usr/bin
- cd $(DIR_APP) && install -m 644 cfg/vnstat.conf /etc
-
- # databases in /var/log instead of /var/lib
- -mkdir -p /var/log/vnstat/
- sed -i -e 's+DatabaseDir.*+DatabaseDir "/var/log/vnstat"+' /etc/vnstat.conf
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2008-10-27 05:55:09 UTC (rev 2021)
+++ ipcop/trunk/make.sh 2008-10-27 06:22:28 UTC (rev 2022)
@@ -1873,7 +1873,6 @@
chroot_make traceroute
chroot_make ulogd
chroot_make vlan
- chroot_make vnstat
chroot_make wireless_tools
chroot_make 3c5x9setup
} # End of ipcop_build()
Modified: ipcop/trunk/src/rc.d/rc.netaddress.up
===================================================================
--- ipcop/trunk/src/rc.d/rc.netaddress.up 2008-10-27 05:55:09 UTC (rev 2021)
+++ ipcop/trunk/src/rc.d/rc.netaddress.up 2008-10-27 06:22:28 UTC (rev 2022)
@@ -40,7 +40,6 @@
if [ "$1" != "NOTGREEN" ]; then
if [ 0$GREEN_COUNT -gt 0 ]; then
/sbin/ifconfig $GREEN_1_DEV $GREEN_1_ADDRESS netmask $GREEN_1_NETMASK \
broadcast $GREEN_1_BROADCAST up
- /usr/bin/vnstat --update --iface $GREEN_1_DEV --nick GREEN_1
else
echo "WARNING: No device set for GREEN"
fi
@@ -48,12 +47,10 @@
if [ 0$ORANGE_COUNT -gt 0 ]; then
/sbin/ifconfig $ORANGE_1_DEV $ORANGE_1_ADDRESS netmask $ORANGE_1_NETMASK \
broadcast $ORANGE_1_BROADCAST up
- /usr/bin/vnstat --update --iface $ORANGE_1_DEV --nick ORANGE_1
fi
if [ 0$BLUE_COUNT -gt 0 ]; then
/sbin/ifconfig $BLUE_1_DEV $BLUE_1_ADDRESS netmask $BLUE_1_NETMASK broadcast \
$BLUE_1_BROADCAST up
- /usr/bin/vnstat --update --iface $BLUE_1_DEV --nick BLUE_1
fi
/etc/rc.d/rc.dnsmasq restart
Modified: ipcop/trunk/src/rc.d/rc.updatered
===================================================================
--- ipcop/trunk/src/rc.d/rc.updatered 2008-10-27 05:55:09 UTC (rev 2021)
+++ ipcop/trunk/src/rc.d/rc.updatered 2008-10-27 06:22:28 UTC (rev 2022)
@@ -133,7 +133,6 @@
if [ -e "/var/ipcop/red/active" ]; then
[ "$IFACE" != "" ] && /sbin/ifconfig $IFACE -multicast
- /usr/bin/vnstat --update --enable --iface $IFACE --nick RED
/etc/rc.d/rc.firewall reload
/usr/local/bin/setfwrules
/usr/local/bin/setportfw
@@ -150,7 +149,6 @@
/usr/local/bin/restartshaping
fi
else
- /usr/bin/vnstat --update --reset --disable --iface $IFACE
/usr/local/bin/ipsecctrl D
/etc/rc.d/rc.firewall reload
fi
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic