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

removed custom background option for urlfilter option is no longer

Browse Source 
supported
reverted cups and squid
change QoS CTRL script
changed exit codes for the red init scripts



git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1129 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-12-23 17:33:32 +00:00
parent ed8286424f
commit d47ad587e7
16 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/rootfiles/core/2/files
View File

@@ -2,8 +2,18 @@ srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
srv/web/ipfire/html/redirect.cgi
var/ipfire/qos/bin/makeqosscripts.pl
var/ipfire/outgoing/bin/outgoingfw.pl
etc/sysconfig/rc.local
etc/rc.d/init.d/networking/red.down/10-ipsec
etc/rc.d/init.d/networking/red.down/10-ovpn
etc/rc.d/init.d/networking/red.up/10-multicast
etc/rc.d/init.d/networking/red.up/30-ddns
etc/rc.d/init.d/networking/red.up/40-ipac
etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
etc/rc.d/init.d/networking/red.up/99-pakfire-update
etc/ppp/options
usr/local/bin/qosctrl

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

@@ -7,4 +7,4 @@ if [ -e "/var/ipfire/qos/enable" ]; then
/usr/local/bin/qosctrl generate
/usr/local/bin/qosctrl start
fi
/usr/local/bin/outgoingfwctrl
/usr/local/bin/outgoingfwctrl restart

4
doc/packages-list.txt
View File

@@ -56,7 +56,6 @@
* coreutils-5.96
* cpio-2.6
* cups-1.2.12
* cups-1.3.4
* cups-1.3.5
* curl-7.15.3
* cyrus-imapd-2.2.12
@@ -140,7 +139,6 @@
* libshout-2.2.2
* libsigc++-2.0.17
* libtool-1.5.22
* libtorrent-0.11.6
* libtorrent-0.11.9
* libupnp-1.3.1
* libusb-0.1.12
@@ -225,14 +223,12 @@
* slang-1.4.9
* smartmontools-5.36
* snort-2.6.1.4
* snort-2.8.0.1
* sox-12.18.1
* spandsp-0.0.3pre24
* squashfs3.2-r2
* squid-2.6.STABLE16
* squid-3.0.STABLE1
* squid-graph-3.2
* squidGuard-1.2.0
* squidGuard-1.3
* sudo-1.6.8p12
* sysfsutils-1.3.0

35
html/cgi-bin/urlfilter.cgi
View File

@@ -159,7 +159,6 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter save and restart'}) ||
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload file'}) ||
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter remove file'}) ||
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload background'}) ||
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload blacklist'}) ||
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter backup'}) ||
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter restore'}))
@@ -217,18 +216,7 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
}
}
if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload background'})
{
&Header::getcgihash(\%filtersettings, {'wantfile' => 1, 'filevar' => 'BACKGROUND'});
if (copy($filtersettings{'BACKGROUND'}, "/home/httpd/html/images/urlfilter/background.jpg") != 1)
{
$errormessage = $!;
goto ERROR;
}
}
if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload blacklist'})
{
&Header::getcgihash(\%filtersettings, {'wantfile' => 1, 'filevar' => 'UPDATEFILE'});
@@ -244,11 +232,11 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
$errormessage = $!;
goto ERROR;
}
if (!(-d "${General::swroot}/urlfilter/update")) { mkdir("${General::swroot}/urlfilter/update"); }
my $exitcode = system("/bin/tar --no-same-owner -xzf ${General::swroot}/urlfilter/blacklists.tar.gz -C ${General::swroot}/urlfilter/update");
if ($exitcode > 0)
{
$errormessage = $Lang::tr{'urlfilter tar error'};
@@ -326,7 +314,7 @@ if (($filtersettings{'ACTION'} eq $Lang::tr{'save'}) ||
{
$errormessage = $!;
}
my $exitcode = system("/bin/tar --no-same-owner --preserve-permissions -xzf ${General::swroot}/urlfilter/backup.tar.gz -C ${General::swroot}/urlfilter/restore");
if ($exitcode > 0)
{
@@ -801,7 +789,7 @@ if (($besettings{'ACTION'} eq $Lang::tr{'urlfilter import blacklist'}) && ($bese
{
$errormessage = $!;
} else {
my $exitcode = system("/bin/tar --no-same-owner --preserve-permissions -xzf $editdir/blacklist.tar.gz -C $editdir");
if ($exitcode > 0)
{
@@ -1478,17 +1466,6 @@ print <<END
<td>&nbsp;</td>
</tr>
</table>
<table width='100%'>
<tr>
<td class='base'><b>$Lang::tr{'urlfilter background image'}</b></td>
</tr>
<tr>
<td><br>$Lang::tr{'urlfilter background text'}:</td>
</tr>
<tr>
<td><input type='file' name='BACKGROUND' size='40' /> &nbsp; <input type='submit' name='ACTION' value='$Lang::tr{'urlfilter upload background'}' /></td>
</tr>
</table>
<hr size='1'>
<table width='100%'>
<tr>
@@ -2795,7 +2772,7 @@ sub writeconfigfile
if ($filtersettings{'SHOW_URL'} eq 'on') { $redirect .= "&url=%u"; }
if ($filtersettings{'SHOW_IP'} eq 'on') { $redirect .= "&ip=%a"; }
$redirect =~ s/^&/?/;
$redirect = "http:\/\/$netsettings{'GREEN_ADDRESS'}:$http_port\/redirect.cgi".$redirect;
$redirect = "http:\/\/$netsettings{'GREEN_ADDRESS'}:$http_port\/redirect.cgi".$redirect;
} else {
$redirect="http:\/\/$netsettings{'GREEN_ADDRESS'}:$http_port\/redirect.cgi";
}
@@ -3040,7 +3017,7 @@ sub writeconfigfile
print FILE "}\n\n";
$category = $blacklist;
}
print FILE "dest files {\n";
print FILE " expressionlist custom\/blocked\/files\n";
if ($filtersettings{'ENABLE_LOG'} eq 'on')

6
lfs/cups
View File

@@ -24,7 +24,7 @@
include Config
VER = 1.3.5
VER = 1.2.12
THISAPP = cups-$(VER)
DL_FILE = $(THISAPP)-source.tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/cups-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups
PAK_VER = 2
PAK_VER = 1
DEPS = "ghostscript"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 355705c528e9a8d0d439da15454d79a6
$(DL_FILE)_MD5 = d410658468384b5ba5d04a808f6157fe
install : $(TARGET)

4
lfs/squid
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.0.STABLE1
VER = 2.6.STABLE16
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ec7458b00a68341854d91e7f6ece56ba
$(DL_FILE)_MD5 = 849bee6f269e6c773f215fd4b41de0e3
install : $(TARGET)

1
make.sh
View File

@@ -523,6 +523,7 @@ buildipfire() {
ipfiremake lsof
ipfiremake centerim
ipfiremake br2684ctl
ipfiremake squidclam
}
buildinstaller() {

4
src/initscripts/init.d/networking/red.down/10-ipsec
View File

@@ -1,3 +1,5 @@
#!/bin/bash
/usr/local/bin/ipsecctrl D
/usr/local/bin/ipsecctrl D &
exit 0

4
src/initscripts/init.d/networking/red.down/10-ovpn
View File

@@ -1,3 +1,5 @@
#!/bin/bash
/usr/local/bin/openvpnctrl -k
/usr/local/bin/openvpnctrl -k &
exit 0

2
src/initscripts/init.d/networking/red.up/10-multicast
View File

@@ -5,3 +5,5 @@
IFACE=`cat /var/ipfire/red/iface 2>/dev/null | tr -d '\012'`
[ "$IFACE" != "" ] && ifconfig $IFACE -multicast
exit 0

2
src/initscripts/init.d/networking/red.up/30-ddns
View File

@@ -1,3 +1,5 @@
#!/bin/bash
/usr/local/bin/setddns.pl -f
exit 0

1
src/initscripts/init.d/networking/red.up/40-ipac
View File

@@ -3,3 +3,4 @@
/etc/rc.d/helper/writeipac.pl
/usr/sbin/fetchipac -S
exit 0

1
src/initscripts/init.d/networking/red.up/50-ipsec
View File

@@ -4,3 +4,4 @@ eval $(/usr/local/bin/readhash /var/ipfire/vpn/settings)
sleep $VPN_DELAYED_START && /usr/local/bin/ipsecctrl S &
exit 0

1
src/initscripts/init.d/networking/red.up/50-ovpn
View File

@@ -2,3 +2,4 @@
/usr/local/bin/openvpnctrl -s
exit 0

2
src/initscripts/init.d/networking/red.up/99-pakfire-update
View File

@@ -1,3 +1,5 @@
#!/bin/sh
nice -n 10 /opt/pakfire/pakfire update >/dev/null 2>&1 &
exit 0

5
src/misc-progs/qosctrl.c
View File

@@ -25,9 +25,6 @@ int main(int argc, char *argv[]) {
exit(1);
}
if (strcmp(argv[1], "generate") == 0)
safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh");
if ((fd = open("/var/ipfire/qos/bin/qos.sh", O_RDONLY)) != -1) {
close(fd);
} else {
@@ -44,6 +41,8 @@ int main(int argc, char *argv[]) {
safe_system("/var/ipfire/qos/bin/qos.sh status");
} else if (strcmp(argv[1], "restart") == 0) {
safe_system("/var/ipfire/qos/bin/qos.sh restart");
} else if (strcmp(argv[1], "generate") == 0) {
safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh");
} else {
fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n");
exit(1);