From fdd5caa192f6cf0845e6b754dfafe19848e97636 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 25 Sep 2015 09:45:40 +0200 Subject: squid3 - code style fixes, improve descriptions --- config/squid3/34/squid_traffic.xml | 149 ++++++++++++++++++++++--------------- 1 file changed, 89 insertions(+), 60 deletions(-) (limited to 'config/squid3/34/squid_traffic.xml') diff --git a/config/squid3/34/squid_traffic.xml b/config/squid3/34/squid_traffic.xml index 3439d598..f7dfa34e 100755 --- a/config/squid3/34/squid_traffic.xml +++ b/config/squid3/34/squid_traffic.xml @@ -2,57 +2,52 @@ - - +. - All rights reserved. - */ -/* ========================================================================== */ + squid_traffic.xml + part of pfSense (https://www.pfSense.org/) + Copyright (C) 2012-2014 Marcello Coutinho + Copyright (C) 2015 ESF, LLC + All rights reserved. +*/ +/* ====================================================================================== */ /* - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + - 1. Redistributions of source code MUST retain the above copyright notice, - this list of conditions and the following disclaimer. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - */ -/* ========================================================================== */ - ]]> - - Describe your package here - Describe your package requirements here - Currently there are no FAQ items provided. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ +/* ====================================================================================== */ + ]]> + squidtraffic - none - Proxy server: Traffic management + 0.3.5 + Proxy server: Traffic Management /usr/local/pkg/squid.inc - - General + + General /pkg_edit.php?xml=squid.xml&id=0 @@ -85,7 +80,7 @@ /pkg.php?xml=squid_users.xml - Real time + Real Time /squid_monitor.php @@ -99,36 +94,57 @@ listtopic - Maximum download size + Maximum Download Size max_download_size - Limit the maximum total download size to the size specified here (in kilobytes). Set to 0 to disable. + + + Set to 0 to disable. + ]]> + input 10 0 - Maximum upload size + Maximum Upload Size max_upload_size - Limit the maximum total upload size to the size specified here (in kilobytes). Set to 0 to disable. + + + Set to 0 to disable. + ]]> + input 10 0 - Overall bandwidth throttling + Overall Bandwidth Throttling overall_throttling - This value specifies (in kilobytes per second) the bandwidth throttle for downloads. Users will gradually have their download speed increased according to this value. Set to 0 to disable bandwidth throttling. + + + Users will gradually have their download speed decreased according to this value.
+ Set to 0 to disable. + ]]> + input 10 0 - Per-host throttling + Per-Host Throttling perhost_throttling - This value specifies the download throttling per host. Set to 0 to disable this. + + + Set to 0 to disable. + ]]> + input 10 @@ -139,7 +155,7 @@ listtopic - Throttle only specific extensions + Throttle Only Specific Extensions throttle_specific Leave this checked to be able to choose the extensions that throttling will be applied to. Otherwise, all files will be throttled. checkbox @@ -147,25 +163,25 @@ on - Throttle binary files + Throttle Binary Files throttle_binaries Check this to apply bandwidth throttle to binary files. This includes compressed archives and executables. checkbox - Throttle CD images + Throttle CD/DVD Image Files throttle_cdimages - Check this to apply bandwidth throttle to CD image files. + Check this to apply bandwidth throttle to CD/DVD image files. checkbox - Throttle multimedia files + Throttle Multimedia Files throttle_multimedia Check this to apply bandwidth throttle to multimedia files, such as movies or songs. checkbox - Throttle other extensions + Throttle Other Extensions throttle_others Comma-separated list of extensions to apply bandwidth throttle to. input @@ -176,9 +192,22 @@ listtopic + + info + + + This may be undesirable on slow links and/or very busy caches. Impatient users may tie up file descriptors and + bandwidth by repeatedly requesting and immediately aborting downloads.
+ When the user aborts a request, Squid will compare the below values to the amount of data transferred so far.

+ If you do not want any retrieval to continue after the client has aborted, set both values below to 0.
+ If you want retrievals to always continue if they are being cached, set 'Finish transfer if less than x KB remaining' to -1. + ]]> + + Finish transfer if less than x KB remaining quick_abort_min - If the transfer has less than x KB remaining, it will finish the retrieval. Set to 0 to abort the transfer immediately. + If the transfer has less than x KB remaining, it will finish the retrieval. input 10 0 @@ -186,7 +215,7 @@ Abort transfer if more than x KB remaining quick_abort_max - If the transfer has more than x KB remaining, it will abort the retrieval. Set to 0 to abort the transfer immediately. + If the transfer has more than x KB remaining, it will abort the retrieval. input 0 @@ -197,7 +226,7 @@ input 10 0 - + squid_validate_traffic($_POST, $input_errors); -- cgit v1.2.3 From 4ffee42c991328e669be00586f186bc2d93c780d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Fri, 25 Sep 2015 14:07:15 +0200 Subject: Fix trailing whitespace --- config/squid3/34/squid_traffic.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/squid3/34/squid_traffic.xml') diff --git a/config/squid3/34/squid_traffic.xml b/config/squid3/34/squid_traffic.xml index f7dfa34e..135ef9ad 100755 --- a/config/squid3/34/squid_traffic.xml +++ b/config/squid3/34/squid_traffic.xml @@ -103,7 +103,7 @@ ]]> input - 10 + 10 0 -- cgit v1.2.3