aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2012-04-16 11:18:50 -0300
committerMarcello Coutinho <marcellocoutinho@gmail.com>2012-04-16 11:18:50 -0300
commit4edb9dc9c97827cf30f836068a6e8a7f8fc690ef (patch)
tree46365500014b901666e77b8f238218e0a1c8f903
parent0966f6a152bea646cdd89c6012bbaeef5533ce19 (diff)
downloadpfsense-packages-4edb9dc9c97827cf30f836068a6e8a7f8fc690ef.tar.gz
pfsense-packages-4edb9dc9c97827cf30f836068a6e8a7f8fc690ef.tar.bz2
pfsense-packages-4edb9dc9c97827cf30f836068a6e8a7f8fc690ef.zip
squid3 - Fix patters typo
-rw-r--r--config/squid-reverse/squid.inc10
-rw-r--r--config/squid-reverse/squid_cache.xml8
2 files changed, 9 insertions, 9 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index f4939201..3828476e 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -852,7 +852,7 @@ if(empty($settings['cache_dynamic_content'])){
$conf.="cache deny dynamic\n";
}
else{
- if(preg_match('/youtube/',$settings['refresh_patters'])){
+ if(preg_match('/youtube/',$settings['refresh_patterns'])){
$conf.=<<<EOC
# Break HTTP standard for flash videos. Keep them in cache even if asked not to.
refresh_pattern -i \.flv$ 10080 90% 999999 ignore-no-cache override-expire ignore-private
@@ -863,7 +863,7 @@ cache allow youtube
EOC;
}
- if(preg_match('/windows/',$settings['refresh_patters'])){
+ if(preg_match('/windows/',$settings['refresh_patterns'])){
$conf.=<<<EOC
range_offset_limit -1
refresh_pattern -i microsoft.com/.*\.(cab|exe|ms[i|u|f]|asf|wm[v|a]|dat|zip) 4320 80% 43200 reload-into-ims
@@ -872,20 +872,20 @@ refresh_pattern -i my.windowsupdate.website.com/.*\.(cab|exe|ms[i|u|f]|asf|wm[v|
EOC;
}
-if(preg_match('/symantec/',$settings['refresh_patters'])){
+if(preg_match('/symantec/',$settings['refresh_patterns'])){
$conf.=<<<EOC
range_offset_limit -1
refresh_pattern liveupdate.symantecliveupdate.com/.*\.(cab|exe|dll|msi) 10080 100% 43200 reload-into-ims
refresh_pattern symantecliveupdate.com/.*\.(cab|exe|dll|msi) 10080 100% 43200 reload-into-ims
EOC;
}
-if(preg_match('/avast/',$settings['refresh_patters'])){
+if(preg_match('/avast/',$settings['refresh_patterns'])){
$conf.=<<<EOC
range_offset_limit -1
refresh_pattern avast.com/.*\.(vpu|cab|stamp|exe) 10080 100% 43200 reload-into-ims
EOC;
}
-if(preg_match('/avira/',$settings['refresh_patters'])){
+if(preg_match('/avira/',$settings['refresh_patterns'])){
$conf.=<<<EOC
range_offset_limit -1
refresh_pattern personal.avira-update.com/.*\.(cab|exe|dll|msi|gz) 10080 100% 43200 reload-into-ims
diff --git a/config/squid-reverse/squid_cache.xml b/config/squid-reverse/squid_cache.xml
index d0e6ffac..01ea7da6 100644
--- a/config/squid-reverse/squid_cache.xml
+++ b/config/squid-reverse/squid_cache.xml
@@ -258,11 +258,11 @@
<size>10</size>
</field>
<field>
- <fielddescr>Refresh Patters</fielddescr>
- <fieldname>refresh_patters</fieldname>
- <description><![CDATA[Once enabling dynamic cache, also apply squid wiki refresh_patters to sites like <a target=_new href='http://wiki.squid-cache.org/ConfigExamples/DynamicContent/YouTube'>Youtube</a> and <a target=_new href='http://wiki.squid-cache.org/SquidFaq/WindowsUpdate'>windowsupdate</a><br>
+ <fielddescr>Refresh Patterns</fielddescr>
+ <fieldname>refresh_patterns</fieldname>
+ <description><![CDATA[With dynamic cache enabled, you can also apply squid wiki refresh_patters to sites like <a target=_new href='http://wiki.squid-cache.org/ConfigExamples/DynamicContent/YouTube'>Youtube</a> and <a target=_new href='http://wiki.squid-cache.org/SquidFaq/WindowsUpdate'>windowsupdate</a><br>
<br><strong>Notes:</strong><br>
- set 'Finish transfer if less than x KB remaining' on 'traffic mgmt' squid tab to -1 when applying these patters.<br><br>
+ Squid wiki suggests 'Finish transfer if less than x KB remaining' on 'traffic mgmt' squid tab to -1 but you can apply your own values to control cache.<br><br>
set Maximum download size on 'traffic mgmt' squid tab to a value that fits patters your are applying.<br>Microsoft may need 200Mb and youtube 4GB.]]></description>
<type>select</type>
<default_value>none</default_value>