aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-11-27 23:06:49 +0100
committerdoktornotor <notordoktor@gmail.com>2015-11-27 23:06:49 +0100
commita21e09c9215a40d3de738ba7f3fa87209eb949e8 (patch)
tree9f91ad76795e6b6d57bfd9e2271f5beadc59cc70 /config/squid3
parent42ac21d898e0d2f87b149b6d49d9a91c95f2450e (diff)
downloadpfsense-packages-a21e09c9215a40d3de738ba7f3fa87209eb949e8.tar.gz
pfsense-packages-a21e09c9215a40d3de738ba7f3fa87209eb949e8.tar.bz2
pfsense-packages-a21e09c9215a40d3de738ba7f3fa87209eb949e8.zip
Fix input validations, improve descriptions
Diffstat (limited to 'config/squid3')
-rw-r--r--config/squid3/34/squid.xml74
1 files changed, 42 insertions, 32 deletions
diff --git a/config/squid3/34/squid.xml b/config/squid3/34/squid.xml
index 28326d7f..903ae694 100644
--- a/config/squid3/34/squid.xml
+++ b/config/squid3/34/squid.xml
@@ -42,7 +42,7 @@
]]>
</copyright>
<name>squid</name>
- <version>0.4.0</version>
+ <version>0.4.5</version>
<title>Proxy Server: General Settings</title>
<include_file>/usr/local/pkg/squid.inc</include_file>
<menu>
@@ -254,7 +254,7 @@
<description>
<![CDATA[
Check to enable the Squid proxy.<br/>
- Note: If unchecked, <strong>all</strong> Squid services will be disabled and stopped.<br/>
+ <strong><span class="errmsg">Note:</span> If unchecked, ALL Squid services will be disabled and stopped.</strong>
]]>
</description>
<type>checkbox</type>
@@ -277,21 +277,24 @@
<description>
<![CDATA[
The interface(s) the proxy server will bind to.<br/>
- <strong>Note: Use CTRL + click to select multiple interfaces.</strong>
+ Note: Use CTRL + click to select multiple interfaces.
]]>
</description>
<type>interfaces_selection</type>
- <required/>
<default_value>lan</default_value>
<multiple/>
</field>
<field>
<fielddescr>Proxy Port</fielddescr>
<fieldname>proxy_port</fieldname>
- <description>This is the port the proxy server will listen on.</description>
+ <description>
+ <![CDATA[
+ This is the port the proxy server will listen on.<br/>
+ (Default: 3128)
+ ]]>
+ </description>
<type>input</type>
<size>5</size>
- <required/>
<default_value>3128</default_value>
</field>
<field>
@@ -386,11 +389,10 @@
<description>
<![CDATA[
The interface(s) the proxy server will transparently intercept requests on.<br/>
- <strong>Note: Use CTRL + click to select multiple interfaces.</strong>
+ Note: Use CTRL + click to select multiple interfaces.
]]>
</description>
<type>interfaces_selection</type>
- <required/>
<default_value>lan</default_value>
<multiple/>
</field>
@@ -410,7 +412,7 @@
<description>
<![CDATA[
Do not forward traffic from these <strong>source</strong> IPs, CIDR nets, hostnames, or aliases through the proxy server but let it pass directly through the firewall.
- (Applies only to transparent mode.)<br/><br/>
+ (Applies only to transparent mode.)<br/>
<strong>Note: Separate entries by semi-colons (;)</strong>
]]>
</description>
@@ -422,8 +424,8 @@
<fieldname>defined_ip_proxy_off_dest</fieldname>
<description>
<![CDATA[
- Do not proxy traffic going to these <strong>destination</strong> IPs, CIDR nets, hostnames, or aliases, but let it pass directly through the firewall.<br/>
- (Applies only to transparent mode.)<br/><br/>
+ Do not proxy traffic going to these <strong>destination</strong> IPs, CIDR nets, hostnames, or aliases, but let it pass directly through the firewall.
+ (Applies only to transparent mode.)<br/>
<strong>Note: Separate entries by semi-colons (;)</strong>
]]>
</description>
@@ -435,7 +437,7 @@
<type>listtopic</type>
</field>
<field>
- <fielddescr>HTTPS/SSL interception</fielddescr>
+ <fielddescr>HTTPS/SSL Interception</fielddescr>
<fieldname>ssl_proxy</fieldname>
<description>Enable SSL filtering.</description>
<type>checkbox</type>
@@ -447,18 +449,22 @@
<description>
<![CDATA[
The interface(s) the proxy server will intercept SSL requests on.<br/>
- <strong>Note: Use CTRL + click to select multiple interfaces.</strong>
+ Note: Use CTRL + click to select multiple interfaces.
]]>
</description>
<type>interfaces_selection</type>
- <required/>
<default_value>lan</default_value>
<multiple/>
</field>
<field>
<fielddescr>SSL Proxy port</fielddescr>
<fieldname>ssl_proxy_port</fieldname>
- <description>This is the port the proxy server will listen on to intercept SSL while using transparent proxy.</description>
+ <description>
+ <![CDATA[
+ This is the port the proxy server will listen on to intercept SSL while using transparent proxy.<br/>
+ (Default: 3129)
+ ]]>
+ </description>
<type>input</type>
<size>5</size>
<default_value>3129</default_value>
@@ -514,7 +520,7 @@
<description>
<![CDATA[
Pass original SSL server certificate information to the user. Allow the user to make an informed decision on whether to trust the server certificate.<br/>
- Hint: Set the subject CN - see <a href="http://wiki.squid-cache.org/Features/MimicSslServerCert">fake certificate properties documentation</a> for details.
+ <strong>Hint:</strong> Set the subject CN - see <a href="http://wiki.squid-cache.org/Features/MimicSslServerCert">fake certificate properties documentation</a> for details.
]]>
</description>
<type>select</type>
@@ -565,6 +571,25 @@
<size>5</size>
</field>
<field>
+ <fielddescr>Log Pages Denied by SquidGuard</fielddescr>
+ <fieldname>log_sqd</fieldname>
+ <description>
+ <![CDATA[
+ Makes it possible for SquidGuard denied log to be included on Squid logs.<br/>
+ <strong>Note: This option will only work if you include the code below in your sgerror.php file.</strong><br/>
+ This forces the client browser to send a second request to Squid with the denied string in URL.<br/><br/>
+ $sge_prefix = (preg_match("/\?/", $cl['u']) ? "&" : "?");<br/>
+ $str[] = '< iframe > src="'. $cl['u'] . $sge_prefix . 'sgr=ACCESSDENIED" width="1" height="1" > < /iframe >';<br/><br/>
+ <strong>Hint: You MUST remove extra spaces in the above iframe HTML tags.</strong>
+ ]]>
+ </description>
+ <type>checkbox</type>
+ </field>
+ <field>
+ <name>Headers Handling, Language and Other Customizations</name>
+ <type>listtopic</type>
+ </field>
+ <field>
<fielddescr>Visible Hostname</fielddescr>
<fieldname>visible_hostname</fieldname>
<description>This is the hostname to be displayed in proxy server error messages.</description>
@@ -663,21 +688,6 @@
<type>checkbox</type>
</field>
<field>
- <fielddescr>Log Pages Denied by SquidGuard</fielddescr>
- <fieldname>log_sqd</fieldname>
- <description>
- <![CDATA[
- Makes it possible for SquidGuard denied log to be included on Squid logs.<br/>
- <strong>Note: This option will only work if you include the code below in your sgerror.php file.</strong><br/>
- This forces the client browser to send a second request to Squid with the denied string in URL.<br/><br/>
- $sge_prefix = (preg_match("/\?/", $cl['u']) ? "&" : "?");<br/>
- $str[] = '< iframe > src="'. $cl['u'] . $sge_prefix . 'sgr=ACCESSDENIED" width="1" height="1" > < /iframe >';<br/><br/>
- <strong>Hint: You MUST remove extra spaces in the above iframe HTML tags.</strong>
- ]]>
- </description>
- <type>checkbox</type>
- </field>
- <field>
<fielddescr>URI Whitespace Characters Handling</fielddescr>
<fieldname>uri_whitespace</fieldname>
<description>
@@ -710,7 +720,7 @@
<fieldname>custom_options</fieldname>
<description>
<![CDATA[
- Squid options added from packages like SquidGuard or HAVP for Squid integration.
+ Squid options added from packages like SquidGuard for Squid integration.
]]>
</description>
<type>textarea</type>