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

update samba to 3.28 and pakfire release 3

Browse Source 
corrected some cgi issues for qos
change qosskript
started core update 2


git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1122 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-12-13 22:10:38 +00:00
parent 381f2e7111
commit da7e266567
9 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/qos/makeqosscripts.pl
View File

@@ -156,7 +156,7 @@ case "\$1" in
### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT
ip link set dev $qossettings{'RED_DEV'} qlen $qossettings{'QLENGTH'}
ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
#ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
### ADD HTB QDISC FOR $qossettings{'RED_DEV'}
tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'}

1
config/rootfiles/core/1/files
View File

@@ -5,3 +5,4 @@ opt/pakfire/lib/functions.sh
srv/web/ipfire/cgi-bin/updatexlrator.cgi
usr/sbin/updxlrator
var/ipfire/updatexlrator/bin/download
etc/httpd/conf/vhosts.d/ipfire-interface.conf

2
config/rootfiles/core/1/update.sh
View File

@@ -4,5 +4,3 @@
extract_files
mv /srv/web/ipfire/html/updatecache /var/
/etc/init.d/squid restart
reload_all

2
config/rootfiles/core/2/files Normal file
View File

@@ -0,0 +1,2 @@
srv/web/ipfire/cgi-bin/qos.cgi
var/ipfire/qos/bin/makeqosscripts.pl

1
config/rootfiles/core/2/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

4
config/rootfiles/core/2/update.sh Normal file
View File

@@ -0,0 +1,4 @@
#!/bin/bash
. /opt/pakfire/lib/functions.sh
extract_files

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

@@ -570,6 +570,11 @@ END
$qossettings{'DEFCLASS_INC'} = "210";
$qossettings{'DEFCLASS_OUT'} = "110";
$qossettings{'ACK'} ="101";
system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
system("/usr/bin/touch /var/ipfire/qos/enable");
system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
system("logger -t ipfire 'QoS started'");
$qossettings{'ENABLED'} = 'on';
&General::writehash("${General::swroot}/qos/settings", \%qossettings);
}
@@ -1149,7 +1154,7 @@ END
<tr><td width='50%' align='left'>$Lang::tr{'min delay'} (8) <td width='50%'><input type="radio" name="TOS" value="8" $checked[8] />
<tr><td width='50%' align='left'>$Lang::tr{'max throughput'} (4) <td width='50%'><input type="radio" name="TOS" value="4" $checked[4] />
<tr><td width='50%' align='left'>$Lang::tr{'max reliability'} (2) <td width='50%'><input type="radio" name="TOS" value="2" $checked[2] />
<tr><td width='50%' align='left'$Lang::tr{'min costs'} (1) <td width='50%'><input type="radio" name="TOS" value="1" $checked[1] />
<tr><td width='50%' align='left'>$Lang::tr{'min costs'} (1) <td width='50%'><input type="radio" name="TOS" value="1" $checked[1] />
<tr><td width='100%' align='right' colspan='2'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOTOS' value='$Lang::tr{'save'}' />
</table></form>
END

6
lfs/samba
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.0.27a
VER = 3.0.28
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 1
PAK_VER = 3
DEPS = "cups cyrus-sasl"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 57aedd342cafddbb28e2936c15dde96b
$(DL_FILE)_MD5 = 8761cd7c02833d959fbebd4f69895075
install : $(TARGET)

2
src/paks/samba/update.sh
View File

@@ -22,3 +22,5 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
./uninstall.sh
./install.sh