aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2012-04-20 02:27:53 -0300
committermarcelloc <marcellocoutinho@gmail.com>2012-04-20 02:27:53 -0300
commitd0c01c5e25cd284b8acc6db83eb420c05c5e51ae (patch)
tree51e2f995fbbcf3c008aa45a5e2c4a7767065845c
parent37681fd565cebf04d2feee3c5a37bb93fcbf1ba0 (diff)
downloadpfsense-packages-d0c01c5e25cd284b8acc6db83eb420c05c5e51ae.tar.gz
pfsense-packages-d0c01c5e25cd284b8acc6db83eb420c05c5e51ae.tar.bz2
pfsense-packages-d0c01c5e25cd284b8acc6db83eb420c05c5e51ae.zip
squid3 - fix refresh_pattern and typo regression
-rw-r--r--config/squid-reverse/squid.inc15
-rw-r--r--config/squid-reverse/squid_cache.xml4
2 files changed, 14 insertions, 5 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 847d6a35..6d092aec 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -875,7 +875,7 @@ 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
# Symantec refresh_pattern
@@ -885,7 +885,7 @@ refresh_pattern symantecliveupdate.com/.*\.(cab|exe|dll|msi) 10080 100% 43200 re
EOC;
}
-if(preg_match('/avast/',$settings['refresh_patters'])){
+if(preg_match('/avast/',$settings['refresh_patterns'])){
$conf.=<<<EOC
# Avast refresh_pattern
@@ -894,7 +894,7 @@ refresh_pattern avast.com/.*\.(vpu|cab|stamp|exe) 10080 100% 43200 reload-into-i
EOC;
}
-if(preg_match('/avira/',$settings['refresh_patters'])){
+if(preg_match('/avira/',$settings['refresh_patterns'])){
$conf.=<<<EOC
# Avira refresh_pattern
@@ -903,6 +903,15 @@ refresh_pattern personal.avira-update.com/.*\.(cab|exe|dll|msi|gz) 10080 100% 43
EOC;
}
+ $refresh_conf=<<<EOC
+
+# Add any of your own refresh_pattern entries above these.
+refresh_pattern ^ftp: 1440 20% 10080
+refresh_pattern ^gopher: 1440 0% 1440
+refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
+refresh_pattern . 0 20% 4320
+EOC;
+
}
$conf .= <<<EOD
diff --git a/config/squid-reverse/squid_cache.xml b/config/squid-reverse/squid_cache.xml
index 4144a7bc..c00322cf 100644
--- a/config/squid-reverse/squid_cache.xml
+++ b/config/squid-reverse/squid_cache.xml
@@ -260,10 +260,10 @@
<field>
<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>
+ <description><![CDATA[With dynamic cache enabled, you can also apply squid wiki refresh_patterns 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>
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>
+ set Maximum download size on 'traffic mgmt' squid tab to a value that fits patterns your are applying.<br>Microsoft may need 200Mb and youtube 4GB.]]></description>
<type>select</type>
<default_value>none</default_value>
<options>