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

kleine fixes am nettraffic

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@599 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-06-01 15:29:00 +00:00
parent 63978f8d6c
commit fd5c306475
5 changed files with 2146 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/cfgroot/monitorTraffic.pl → config/nettraffic/monitorTraffic.pl
View File

@@ -13,7 +13,7 @@ use strict;
# enable only the following on debugging purpose
use warnings;
require '/var/ipfire/general-functions.pl';
require '/var/ipcop/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/net-traffic/net-traffic-lib.pl";
require "${General::swroot}/net-traffic/net-traffic-admin.pl";
@@ -296,9 +296,9 @@ sub sendEmail
my $template = "";
my %ipfireSettings = ();
&General::readhash("${General::swroot}/main/settings", \%ipfireSettings);
my $host = "$ipfireSettings{'HOSTNAME'}.$ipfireSettings{'DOMAINNAME'}";
my %ipcopSettings = ();
&General::readhash("${General::swroot}/main/settings", \%ipcopSettings);
my $host = "$ipcopSettings{'HOSTNAME'}.$ipcopSettings{'DOMAINNAME'}";
my $subject = "[Net-Traffic] $host: ";

2083
config/nettraffic/sendEmail_nettraffic Normal file
View File

File diff suppressed because it is too large Load Diff

1
config/rootfiles/common/apache2
View File

@@ -1319,6 +1319,7 @@ srv/web/ipfire/cgi-bin/speed.cgi
srv/web/ipfire/cgi-bin/system.cgi
srv/web/ipfire/cgi-bin/time.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
srv/web/ipfire/cgi-bin/trafficadm.cgi
srv/web/ipfire/cgi-bin/traffics.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/upload.cgi

5
lfs/configroot
View File

@@ -93,7 +93,6 @@ $(TARGET) :
cp $(DIR_SRC)/config/cfgroot/modem-settings $(CONFIG_ROOT)/modem/settings
cp $(DIR_SRC)/config/cfgroot/net-traffic-lib.pl $(CONFIG_ROOT)/net-traffic/net-traffic-lib.pl
cp $(DIR_SRC)/config/cfgroot/net-traffic-admin.pl $(CONFIG_ROOT)/net-traffic/net-traffic-admin.pl
cp $(DIR_SRC)/config/cfgroot/monitorTraffic.pl /usr/local/bin/monitorTraffic.pl
cp $(DIR_SRC)/config/cfgroot/nfs-server $(CONFIG_ROOT)/nfs/nfs-server
cp $(DIR_SRC)/config/cfgroot/p2protocols $(CONFIG_ROOT)/outgoing/p2protocols
cp $(DIR_SRC)/config/outgoingfw/outgoingfw.pl $(CONFIG_ROOT)/outgoing/bin/
@@ -132,10 +131,6 @@ $(TARGET) :
cp $(DIR_SRC)/langs/de/cgi-bin/de.pl $(CONFIG_ROOT)/langs/
cp $(DIR_SRC)/langs/en/cgi-bin/en.pl $(CONFIG_ROOT)/langs/
# Copy Net-Traffic Templates
cp $(DIR_SRC)/config/nettraffic/templates/* $(CONFIG_ROOT)/net-traffic/templates/
touch /var/log/net-traffic.log
# Configroot permissions
chown -R nobody:nobody $(CONFIG_ROOT)
chown root:root $(CONFIG_ROOT)

58
lfs/nettraffic Normal file
View File

@@ -0,0 +1,58 @@
###############################################################################
# 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> #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = ipfire
THISAPP = nettraffic
DIR_APP = $(DIR_SRC)/config/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
install : $(TARGET)
check :
download :
md5 :
###############################################################################
# Installation Details
###############################################################################
cp $(DIR_APP)/templates/* /var/ipfire/net-traffic/templates/
touch /var/log/net-traffic.log
cp $(DIR_SRC)/config/cfgroot/monitorTraffic.pl /usr/local/bin/monitorTraffic.pl
cp $(DIR_SRC)/config/cfgroot/sendEmail_nettraffic /usr/local/bin/sendEmail_nettraffic
chown root.root /usr/local/bin/monitorTraffic.pl
chown root.root /usr/local/bin/sendEmail_nettraffic
chmod 0754 /usr/local/bin/monitorTraffic.pl
chmod 0754 /usr/local/bin/sendEmail_nettraffic