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

Hinzugefügt:

Browse Source 
* Morningreconnect Script
Geändert:
  * Neue Spamassassin Version. 3.1.3
  * Interface umfangreich bearbeitet in Layout und angezeigten Texten.
  * DHCP-Leases-Error gefixt
  * lq-Graph pingt nun nach www.heise.de
  * IP-Anzeige für PPPoE/DSL gefixt.
  * Connectionstate vom IPCop übernommen.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@164 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-06-06 19:12:22 +00:00
parent 90350ff3f3
commit 986e08d996
43 changed files with 461 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/rc.d/rc.sysinit
View File

@@ -3,7 +3,7 @@
# $Id: rc.sysinit,v 1.18.2.36 2005/12/01 20:13:08 eoberlander Exp $
#
eval $(/usr/local/bin/readhash CONFIG_ROOT/main/settings)
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
umask 022
@@ -153,7 +153,7 @@ LANG=en_US.utf8
export LANG
echo "Setting consolefonts"
eval $(/usr/local/bin/readhash CONFIG_ROOT/main/settings)
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
for i in 2 3 4 5 6; do
> /dev/tty$i
done
@@ -181,8 +181,8 @@ echo "Clearing old files"
rm -f /var/run/{*.pid,*.sem,*.tdb}
rm -f /var/run/dhcpcd-*.pid
rm -f /var/lock/{LCK..tty*,rc.updatered.lock}
rm -f CONFIG_ROOT/dhcpc/{*.pid,*.cache,*.info}
rm -f CONFIG_ROOT/red/{active,eciadsl-synch-done}
rm -f /var/ipfire/dhcpc/{*.pid,*.cache,*.info}
rm -f /var/ipfire/red/{active,eciadsl-synch-done}
echo "Setting the clock"
/sbin/hwclock --hctosys
@@ -193,9 +193,9 @@ touch /var/log/wtmp
chgrp utmp /var/run/utmp /var/log/wtmp
chmod 0664 /var/run/utmp /var/log/wtmp
if [ -x /usr/sbin/isapnp -a -f CONFIG_ROOT/isapnp/isapnp.conf -a ! -f /proc/isapnp ]; then
if [ -x /usr/sbin/isapnp -a -f /var/ipfire/isapnp/isapnp.conf -a ! -f /proc/isapnp ]; then
echo "Running isapnp"
/usr/sbin/isapnp CONFIG_ROOT/isapnp/isapnp.conf 2>/dev/null
/usr/sbin/isapnp /var/ipfire/isapnp/isapnp.conf 2>/dev/null
fi
if [ ! -e /etc/ssh/ssh_host_key ]; then
@@ -232,38 +232,40 @@ echo "Running /etc/rc.d/rc.network"
echo "Dumping boot messages"
dmesg > /var/log/dmesg
if [ -e /var/log/rrd/disk.rrd ]; then
echo "Adjusting graphs to compensate for boot"
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk.rrd","-t","readsect:writesect","N:U:U");'
fi
if [ -e /var/log/rrd/disk-hda.rrd ]; then
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hda.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
fi
if [ -e /var/log/rrd/disk-hdb.rrd ]; then
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdb.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
fi
if [ -e /var/log/rrd/disk-hdc.rrd ]; then
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdc.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
fi
if [ -e /var/log/rrd/disk-hdd.rrd ]; then
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdd.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
fi
if [ -e /var/log/rrd/disk-hde.rrd ]; then
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hde.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
fi
if [ -e /var/log/rrd/disk-hdf.rrd ]; then
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdf.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
fi
if [ -e /var/log/rrd/disk-hdg.rrd ]; then
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdg.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
fi
if [ -e /var/log/rrd/disk-hdh.rrd ]; then
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdh.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
fi
if [ -e /tmp/hddshutdown-stat ] ; then
rm /tmp/hddshutdown-*"
fi
/usr/local/bin/hddshutdown
echo 7200 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_established
#if [ -e /var/log/rrd/disk.rrd ]; then
# echo "Adjusting graphs to compensate for boot"
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk.rrd","-t","readsect:writesect","N:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hda.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hda.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdb.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdb.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdc.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdc.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdd.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdd.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hde.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hde.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdf.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdf.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdg.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdg.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdh.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdh.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /tmp/hddshutdown-stat ] ; then
# rm /tmp/hddshutdown-*"
#fi
#/usr/local/bin/hddshutdown
echo "Starting crond"
/usr/sbin/fcron
@@ -280,7 +282,7 @@ echo "Starting ntpd (if enabled)"
echo "Starting openvpn (if enabled)"
/usr/local/bin/openvpnctrl --start-daemon-only
if [ -e "CONFIG_ROOT/proxy/squid.conf" ]; then
if [ -e "/var/ipfire/proxy/squid.conf" ]; then
echo "Starting squid (if enabled)"
/usr/local/bin/restartsquid
fi

4
src/scripts/makegraphs
View File

@@ -28,7 +28,7 @@ use strict;
#use warnings;
use RRDs;
require "CONFIG_ROOT/general-functions.pl";
require "/var/ipfire/general-functions.pl";
require "${General::swroot}/lang.pl";
my (%settings, @ipacsum, $iface, $ERROR);
@@ -625,7 +625,7 @@ sub updatelq {
my $roundtrip=0;
my $test=0;
# LQ_GATEWAY is the ip of your isp's public ip facing you
my $LQ_GATEWAY=`netstat -r | grep ^default | awk '{print \$2}'`;
my $LQ_GATEWAY='www.heise.de';
my $NUMPINGS=10;
my $pingoutput = `ping -c $NUMPINGS -q $LQ_GATEWAY`;
chomp;

18
src/scripts/morningreconnect Normal file
View File

@@ -0,0 +1,18 @@
#!/bin/bash
#
# IPFire SCRIPTs
#
# This code is distributed under the terms of the GPL
#
# (c) The IPFire Team
# begin
if [ -e "/var/ipfire/morningreconnect/enable" ]; then
logger -t ipfire MorningReconnect executed!
/etc/rc.d/rc.red stop
/bin/sleep 10
/etc/rc.d/rc.red start
fi
# end