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

Hinzugefügt:

Browse Source 
* Cron-Ordner.
  * Eine Perl-Datei für den GNUmp3d hinzugefügt.
  * run-parts-Script.
Geändert:
  * Versucht das QoS kompatibel für den IE zu machen.
  * Bootsplashbar wird nichtmehr im Textmodus versucht einzublenden.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@217 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-07-22 14:33:17 +00:00
parent 20e891c64a
commit 649fd2958d
8 changed files with 157 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/cron/crontab
View File

@@ -6,6 +6,14 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
MAILTO=root
HOME=/
# Do all jobs in this directories
*/1 * * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.minutely
*/5 * * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.cyclic
01 * * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.hourly
25 1 * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.daily
47 2 * * 0 test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly
52 3 1 * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.monthly
# Log rotation
01 * * * * /usr/sbin/logrotate /etc/logrotate.conf

1
doc/packages-list.txt
View File

@@ -35,6 +35,7 @@
* arping-2.05
* as86-0.16.17
* asterisk-1.2.9.1
* asterisk-1.2.9.1
* autoconf-2.59
* automake-1.8.4
* bash-2.05b

109
html/cgi-bin/qos.cgi
View File

@@ -873,13 +873,34 @@ END
<td align='center' bgcolor='#EAEAEA'>$classline[4]
<td align='center' bgcolor='#EAEAEA'>$classline[5]
<td align='center' bgcolor='#EAEAEA'>$classline[6]
<td align='right' bgcolor='#EAEAEA'><input type='hidden' name='CLASS' value='$classline[1]'>
<button type='submit' name='DOCLASS' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
<button type='submit' name='ACTION' value='Unterklasse hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addblue.gif' width="20" height="20" alt="Unterklasse hinzufuegen"></button>&nbsp;
<button type='submit' name='ACTION' value='Level7-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addgreen.gif' width="20" height="20" alt="Level7-Regel hinzufuegen"></button>&nbsp;
<button type='submit' name='ACTION' value='Port-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/add.gif' width="20" height="20" alt="Port-Regel hinzufuegen"></button>&nbsp;
<button type='submit' name='DOCLASS' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
</form>
<td align='right' bgcolor='#EAEAEA'>
<table border='0'><tr>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='DOCLASS' value='Bearbeiten'>
<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='ACTION' value='Unterklasse hinzufuegen'>
<input type='image' alt='Unterklasse hinzufuegen' src='/images/addblue.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
<input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
<input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='DOCLASS' value='Loeschen'>
<input type='image' alt='Loeschen' src='/images/delete.gif'>
</form>
</table>
END
;
foreach $subclassentry (sort @subclasses)
@@ -922,13 +943,34 @@ END
<td align='center' bgcolor='#EAEAEA'>$classline[4]
<td align='center' bgcolor='#EAEAEA'>$classline[5]
<td align='center' bgcolor='#EAEAEA'>$classline[6]
<td align='right' bgcolor='#EAEAEA'><input type='hidden' name='CLASS' value='$classline[1]'>
<button type='submit' name='DOCLASS' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
<button type='submit' name='ACTION' value='Unterklasse hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addblue.gif' width="20" height="20" alt="Unterklasse hinzufuegen"></button>&nbsp;
<button type='submit' name='ACTION' value='Level7-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addgreen.gif' width="20" height="20" alt="Level7-Regel hinzufuegen"></button>&nbsp;
<button type='submit' name='ACTION' value='Port-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/add.gif' width="20" height="20" alt="Port-Regel hinzufuegen"></button>&nbsp;
<button type='submit' name='DOCLASS' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
</form>
<td align='right' bgcolor='#EAEAEA'>
<table border='0'><tr>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='DOCLASS' value='Bearbeiten'>
<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='ACTION' value='Unterklasse hinzufuegen'>
<input type='image' alt='Unterklasse hinzufuegen' src='/images/addblue.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
<input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
<input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$classline[1]'>
<input type='hidden' name='DOCLASS' value='Loeschen'>
<input type='image' alt='Loeschen' src='/images/delete.gif'>
</form>
</table>
END
;
foreach $subclassentry (sort @subclasses)
@@ -987,16 +1029,26 @@ END
if ( $l7ruleline[1] eq $qossettings{'RED_DEV'} )
{
print <<END
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<tr><td align='center' bgcolor='#EAEAEA'>$l7ruleline[1]
<td align='center' bgcolor='#EAEAEA'>$l7ruleline[0]
<td align='center' bgcolor='#EAEAEA'>$l7ruleline[2]
<td align='center' bgcolor='#EAEAEA'>$l7ruleline[3]
<td align='center' bgcolor='#EAEAEA'>$l7ruleline[4]
<td align='right' bgcolor='#EAEAEA'><input type='hidden' name='CLASS' value='$l7ruleline[0]'><input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
<button type='submit' name='DOLEVEL7' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
<button type='submit' name='DOLEVEL7' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
</form>
<td align='right' bgcolor='#EAEAEA'>
<table border='0'><tr>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$l7ruleline[0]'>
<input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
<input type='hidden' name='DOLEVEL7' value='Bearbeiten'>
<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$l7ruleline[0]'>
<input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
<input type='hidden' name='DOLEVEL7' value='Loeschen'>
<input type='image' alt='Loeschen' src='/images/delete.gif'>
</form>
</table>
END
;
}
@@ -1014,10 +1066,21 @@ END
<td align='center' bgcolor='#EAEAEA'>$l7ruleline[2]
<td align='center' bgcolor='#EAEAEA'>$l7ruleline[3]
<td align='center' bgcolor='#EAEAEA'>$l7ruleline[4]
<td align='right' bgcolor='#EAEAEA'><input type='hidden' name='CLASS' value='$l7ruleline[0]'><input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
<button type='submit' name='DOLEVEL7' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
<button type='submit' name='DOLEVEL7' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
</form>
<td align='right' bgcolor='#EAEAEA'>
<table border='0'><tr>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$l7ruleline[0]'>
<input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
<input type='hidden' name='DOLEVEL7' value='Bearbeiten'>
<input type='image' alt='Bearbeiten' src='/images/edit.gif'>
</form>
<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='CLASS' value='$l7ruleline[0]'>
<input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
<input type='hidden' name='DOLEVEL7' value='Loeschen'>
<input type='image' alt='Loeschen' src='/images/delete.gif'>
</form>
</table>
END
;
}

2
lfs/fcron
View File

@@ -87,6 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
echo "root" > /etc/fcron.allow
echo "all" > /etc/fcron.deny
chmod u-s /usr/bin/fcrontab /usr/bin/fcronsighup
mkdir -p /etc/fcron.minutely /etc/fcron.cyclic /etc/fcron.hourly \
/etc/fcron.daily /etc/fcron.weekly /etc/fcron.monthly
/usr/bin/fcrontab $(DIR_SRC)/config/cron/crontab
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
src/ROOTFILES.i386
View File

@@ -1377,6 +1377,7 @@ usr/local/bin/rcgnump3d
usr/local/bin/rcnfs-server
usr/local/bin/rcpostfix
usr/local/bin/rcwinbind
usr/local/bin/run-parts
#usr/local/doc
#usr/local/etc
#usr/local/include
@@ -14138,6 +14139,7 @@ usr/lib/perl5/5.8.5/unicore/Name.pl
#usr/lib/perl5/5.8.5/unicore/PropValueAliases.txt
#usr/lib/perl5/5.8.5/unicore/Properties
#usr/lib/perl5/5.8.5/unicore/PropertyAliases.txt
usr/lib/perl5/5.8.5/unicore/PVA.pl
#usr/lib/perl5/5.8.5/unicore/README.perl
#usr/lib/perl5/5.8.5/unicore/ReadMe.txt
#usr/lib/perl5/5.8.5/unicore/Scripts.txt

8
src/rc.d/rc.halt
View File

@@ -10,11 +10,15 @@ progressbar()
echo "Usage: progressbar {progress}"
exit 1
fi
echo "show $(( 65534 * $1 / 9 ))" > /proc/splash
if [ -e /proc/splash ]; then
echo "show $(( 65534 * $1 / 9 ))" > /proc/splash
fi
}
# Set bootsplash
progressbar 9
echo "silent" > /proc/splash
if [ -e /proc/splash ]; then
echo "silent" > /proc/splash
fi
echo "Stopping the RED interface..."
progressbar 8

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

@@ -19,7 +19,9 @@ progressbar()
echo "Usage: progressbar {progress}"
exit 1
fi
echo "show $(( 65534 * $1 / $NUMBEROFSCRIPTS ))" > /proc/splash
if [ -e /proc/splash ]; then
echo "show $(( 65534 * $1 / $NUMBEROFSCRIPTS ))" > /proc/splash
fi
}
echo "Mounting /proc filesystem"

49
src/scripts/run-parts Normal file
View File

@@ -0,0 +1,49 @@
#!/bin/sh
# run-parts: Runs all the scripts found in a directory.
# keep going when something fails
set +e
if [ $# -lt 1 ]; then
echo "Usage: run-parts <directory>"
exit 1
fi
if [ ! -d $1 ]; then
echo "Not a directory: $1"
echo "Usage: run-parts <directory>"
exit 1
fi
# There are several types of files that we would like to
# ignore automatically, as they are likely to be backups
# of other scripts:
IGNORE_SUFFIXES="~ ^ , .bak .new .rpmsave .rpmorig .rpmnew .swp"
# Main loop:
for SCRIPT in $1/* ; do
# If this is not a regular file, skip it:
if [ ! -f $SCRIPT ]; then
continue
fi
# Determine if this file should be skipped by suffix:
SKIP=false
for SUFFIX in $IGNORE_SUFFIXES ; do
if [ ! "`basename $SCRIPT $SUFFIX`" = "`basename $SCRIPT`" ]; then
SKIP=true
break
fi
done
if [ "$SKIP" = "true" ]; then
continue
fi
# If we've made it this far, then run the script if it's executable:
if [ -x $SCRIPT ]; then
echo "$SCRIPT:"
echo
$SCRIPT 2>&1
echo
fi
done
exit 0