From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. dcd60d274ef7245552ffd0c57c15995a220d13a2
Date: Tue, 06 Mar 2018 15:14:31 +0000 [thread overview]
Message-ID: <20180306151431.803CF106D063@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6246 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via dcd60d274ef7245552ffd0c57c15995a220d13a2 (commit)
via 20ffa7d1a896e5d8101f4e82ef11f8fa5b2ad15c (commit)
via 318434affb14cadbfdbe877ae5b1f00aacacea24 (commit)
via 53d6755451808f8d6eeca8275714d97985d9495b (commit)
from 01bec956555de7966990047406cbf417d314c40d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit dcd60d274ef7245552ffd0c57c15995a220d13a2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 6 15:13:56 2018 +0000
core120: Ship updated qos.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 20ffa7d1a896e5d8101f4e82ef11f8fa5b2ad15c
Author: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Date: Tue Mar 6 15:56:48 2018 +0100
As described in bug 11257 there is a mistake in the qos templates. The sum of the guaranteed bandwidth of the classes 101 - 120 is bigger than the available bandwidth. I adjusted the guaranteed bandwidth of the classes 101 - 104 so that each of them has a
Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 318434affb14cadbfdbe877ae5b1f00aacacea24
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 6 15:12:42 2018 +0000
core120: Ship updated proxy.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 53d6755451808f8d6eeca8275714d97985d9495b
Author: Daniel Weismüller via Development <development(a)lists.ipfire.org>
Date: Fri Feb 16 13:04:50 2018 +0100
squid: Add RAM-only Proxy functionality
As suggested by Oliver "giller" Fieker <oli(a)new-lan.de>
in bug 10592 I added the functionality to use the squid as ram-only cache.
Further it defines the maximum_object_size_in_memory
as 2% of the in the webif defined "Memory cache size".
The maximum_object_size_in_memory should have a useful
size of the defined memory cache and I don't want to
create another variable which muste be fulled in by the user.
Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Suggested-by: Oliver "giller" Fieker <oli(a)new-lan.de>
Suggested-by: Kim Wölfel <xaver4all(a)gmx.de>
Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>
Cc: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/120/filelists/files | 2 ++
html/cgi-bin/proxy.cgi | 12 ++++++++----
html/cgi-bin/qos.cgi | 8 ++++----
3 files changed, 14 insertions(+), 8 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/core/120/filelists/files
index ad9da24a5..aac6528e8 100644
--- a/config/rootfiles/core/120/filelists/files
+++ b/config/rootfiles/core/120/filelists/files
@@ -5,6 +5,8 @@ etc/fcron.daily/openvpn-crl-updater
etc/rc.d/init.d/dhcp
etc/rc.d/init.d/unbound
srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/lib/python2.7/lib-dynload/_hashlib.so
usr/lib/python2.7/lib-dynload/_ssl.so
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 66ca86953..c36fc4e70 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -401,8 +401,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
$errormessage = $Lang::tr{'proxy errmsg filedescriptors'};
goto ERROR;
}
- if (!($proxysettings{'CACHE_MEM'} =~ /^\d+/) ||
- ($proxysettings{'CACHE_MEM'} < 1))
+ if (!($proxysettings{'CACHE_MEM'} =~ /^\d+/))
{
$errormessage = $Lang::tr{'advproxy errmsg mem cache size'};
goto ERROR;
@@ -3172,7 +3171,7 @@ END
}
}
- if ($proxysettings{'CACHE_SIZE'} > 0)
+ if (($proxysettings{'CACHE_SIZE'} > 0) || ($proxysettings{'CACHE_MEM'} > 0))
{
print FILE "\n";
@@ -3269,7 +3268,12 @@ cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DI
END
;
} else {
- print FILE "cache deny all\n\n";
+ if ($proxysettings{'CACHE_MEM'} > 0) {
+ # always 2% of CACHE_MEM defined as max object size
+ print FILE "maximum_object_size_in_memory " . int($proxysettings{'CACHE_MEM'} * 1024 * 0.02) . " KB\n\n";
+ } else {
+ print FILE "cache deny all\n\n";
+ }
}
print FILE <<END
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 071b93f5d..b7af11204 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -510,17 +510,17 @@ elsif ($qossettings{'ACTION'} eq $Lang::tr{'template'} )
}
open( FILE, "> $classfile" ) or die "Unable to write $classfile";
print FILE <<END
-imq0;200;1;$DOWN[10];$DOWN[1];;;8;VoIP;
+imq0;200;1;$DOWN[20];$DOWN[1];;;8;VoIP;
imq0;203;4;$DOWN[20];$DOWN[1];;;0;VPN;
imq0;204;5;$DOWN[20];$DOWN[1];;;8;Webtraffic;
imq0;210;6;1;$DOWN[1];;;0;Default;
imq0;220;7;1;$DOWN[1];;;1;P2P;
-$qossettings{'RED_DEV'};101;1;$UP[2];$UP[1];;;8;ACKs;
-$qossettings{'RED_DEV'};102;2;$UP[3];$UP[1];;;8;VoIP;
+$qossettings{'RED_DEV'};101;1;$UP[10];$UP[1];;;8;ACKs;
+$qossettings{'RED_DEV'};102;2;$UP[10];$UP[1];;;8;VoIP;
+$qossettings{'RED_DEV'};103;4;$UP[10];$UP[1];;;2;VPN;
$qossettings{'RED_DEV'};104;5;$UP[10];$UP[1];;;8;Webtraffic;
$qossettings{'RED_DEV'};110;6;1;$UP[1];;;0;Default;
$qossettings{'RED_DEV'};120;7;1;$UP[1];;;1;P2P;
-$qossettings{'RED_DEV'};103;4;$UP[2];$UP[1];;;2;VPN;
END
;
close FILE;
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2018-03-06 15:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180306151431.803CF106D063@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox