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
16 files changed:
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/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
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
/usr/local/bin/qosctrl generate
/usr/local/bin/qosctrl start
fi
/usr/local/bin/qosctrl generate
/usr/local/bin/qosctrl start
fi
-/usr/local/bin/outgoingfwctrl
+/usr/local/bin/outgoingfwctrl restart
* coreutils-5.96
* cpio-2.6
* cups-1.2.12
* coreutils-5.96
* cpio-2.6
* cups-1.2.12
* cups-1.3.5
* curl-7.15.3
* cyrus-imapd-2.2.12
* cups-1.3.5
* curl-7.15.3
* cyrus-imapd-2.2.12
* libshout-2.2.2
* libsigc++-2.0.17
* libtool-1.5.22
* libshout-2.2.2
* libsigc++-2.0.17
* libtool-1.5.22
* libtorrent-0.11.9
* libupnp-1.3.1
* libusb-0.1.12
* libtorrent-0.11.9
* libupnp-1.3.1
* libusb-0.1.12
* slang-1.4.9
* smartmontools-5.36
* snort-2.6.1.4
* slang-1.4.9
* smartmontools-5.36
* snort-2.6.1.4
* sox-12.18.1
* spandsp-0.0.3pre24
* squashfs3.2-r2
* squid-2.6.STABLE16
* squid-3.0.STABLE1
* squid-graph-3.2
* 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.3
* sudo-1.6.8p12
* sysfsutils-1.3.0
* squidGuard-1.3
* sudo-1.6.8p12
* sysfsutils-1.3.0
($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 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'}))
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload blacklist'}) ||
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter backup'}) ||
($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter restore'}))
-
- 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'});
if ($filtersettings{'ACTION'} eq $Lang::tr{'urlfilter upload blacklist'})
{
&Header::getcgihash(\%filtersettings, {'wantfile' => 1, 'filevar' => 'UPDATEFILE'});
$errormessage = $!;
goto ERROR;
}
$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 (!(-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'};
if ($exitcode > 0)
{
$errormessage = $Lang::tr{'urlfilter tar error'};
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)
{
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)
{
{
$errormessage = $!;
} else {
{
$errormessage = $!;
} else {
my $exitcode = system("/bin/tar --no-same-owner --preserve-permissions -xzf $editdir/blacklist.tar.gz -C $editdir");
if ($exitcode > 0)
{
my $exitcode = system("/bin/tar --no-same-owner --preserve-permissions -xzf $editdir/blacklist.tar.gz -C $editdir");
if ($exitcode > 0)
{
<td> </td>
</tr>
</table>
<td> </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' /> <input type='submit' name='ACTION' value='$Lang::tr{'urlfilter upload background'}' /></td>
-</tr>
-</table>
<hr size='1'>
<table width='100%'>
<tr>
<hr size='1'>
<table width='100%'>
<tr>
if ($filtersettings{'SHOW_URL'} eq 'on') { $redirect .= "&url=%u"; }
if ($filtersettings{'SHOW_IP'} eq 'on') { $redirect .= "&ip=%a"; }
$redirect =~ s/^&/?/;
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";
}
} else {
$redirect="http:\/\/$netsettings{'GREEN_ADDRESS'}:$http_port\/redirect.cgi";
}
print FILE "}\n\n";
$category = $blacklist;
}
print FILE "}\n\n";
$category = $blacklist;
}
print FILE "dest files {\n";
print FILE " expressionlist custom\/blocked\/files\n";
if ($filtersettings{'ENABLE_LOG'} eq 'on')
print FILE "dest files {\n";
print FILE " expressionlist custom\/blocked\/files\n";
if ($filtersettings{'ENABLE_LOG'} eq 'on')
THISAPP = cups-$(VER)
DL_FILE = $(THISAPP)-source.tar.bz2
THISAPP = cups-$(VER)
DL_FILE = $(THISAPP)-source.tar.bz2
DIR_APP = $(DIR_SRC)/cups-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups
DIR_APP = $(DIR_SRC)/cups-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = cups
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 355705c528e9a8d0d439da15454d79a6
+$(DL_FILE)_MD5 = d410658468384b5ba5d04a808f6157fe
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.bz2
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ec7458b00a68341854d91e7f6ece56ba
+$(DL_FILE)_MD5 = 849bee6f269e6c773f215fd4b41de0e3
ipfiremake lsof
ipfiremake centerim
ipfiremake br2684ctl
ipfiremake lsof
ipfiremake centerim
ipfiremake br2684ctl
-/usr/local/bin/ipsecctrl D
+/usr/local/bin/ipsecctrl D &
+
+exit 0
-/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -k &
+
+exit 0
IFACE=`cat /var/ipfire/red/iface 2>/dev/null | tr -d '\012'`
[ "$IFACE" != "" ] && ifconfig $IFACE -multicast
IFACE=`cat /var/ipfire/red/iface 2>/dev/null | tr -d '\012'`
[ "$IFACE" != "" ] && ifconfig $IFACE -multicast
#!/bin/bash
/usr/local/bin/setddns.pl -f
#!/bin/bash
/usr/local/bin/setddns.pl -f
/etc/rc.d/helper/writeipac.pl
/usr/sbin/fetchipac -S
/etc/rc.d/helper/writeipac.pl
/usr/sbin/fetchipac -S
sleep $VPN_DELAYED_START && /usr/local/bin/ipsecctrl S &
sleep $VPN_DELAYED_START && /usr/local/bin/ipsecctrl S &
/usr/local/bin/openvpnctrl -s
/usr/local/bin/openvpnctrl -s
#!/bin/sh
nice -n 10 /opt/pakfire/pakfire update >/dev/null 2>&1 &
#!/bin/sh
nice -n 10 /opt/pakfire/pakfire update >/dev/null 2>&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 {
if ((fd = open("/var/ipfire/qos/bin/qos.sh", O_RDONLY)) != -1) {
close(fd);
} else {
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");
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);
} else {
fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n");
exit(1);