squid3 - merge squid3 and squid-reverse in one package

1 files changed, 88 insertions, 38 deletions

diff --git a/config/squid-reverse/squid.xml b/config/squid-reverse/squid.xml
index fdeaacb9..c4a64cf7 100644
--- a/config/squid-reverse/squid.xml
+++ b/config/squid-reverse/squid.xml
@@ -55,6 +55,12 @@
 		<section>Services</section>
 		<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 	</menu>
+	<menu>
+		<name>Reverse Proxy</name>
+		<tooltiptext>Modify the proxy reverse server's settings</tooltiptext>
+		<section>Services</section>
+		<url>/pkg_edit.php?xml=squid_reverse_general.xml&amp;id=0</url>
+	</menu>
 	<service>
 		<name>squid</name>
 		<rcfile>squid.sh</rcfile>
@@ -68,15 +74,15 @@
 			<active/>
 		</tab>
 		<tab>
-			<text>Upstream Proxy</text>
+			<text>Upstream</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Cache Mgmt</text>
+			<text>Cache</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Access Control</text>
+			<text>ACLs</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
 		<tab>
@@ -84,17 +90,17 @@
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Reverse Settings</text>
-			<url>/pkg_edit.php?xml=squid_reverse.xml&amp;id=0</url>
-		</tab>
-		<tab>
-			<text>Auth Settings</text>
+			<text>Authentication</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
 		<tab>
-			<text>Local Users</text>
+			<text>Users</text>
 			<url>/pkg.php?xml=squid_users.xml</url>
 		</tab>
+		<tab>
+			<text>Sync</text>
+			<url>/pkg_edit.php?xml=squid_sync.xml</url>
+		</tab>
 	</tabs>
 	<!-- Installation -->
 	<additional_files_needed>
@@ -105,6 +111,26 @@
 	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
+		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse_general.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+	    <prefix>/usr/local/pkg/</prefix>
+	    <chmod>0755</chmod>
+		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse_general_peer.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+	    <prefix>/usr/local/pkg/</prefix>
+	    <chmod>0755</chmod>
+		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse_general_uri.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+	    <prefix>/usr/local/pkg/</prefix>
+	    <chmod>0755</chmod>
+		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_reverse_sync.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+	    <prefix>/usr/local/pkg/</prefix>
+	    <chmod>0755</chmod>
 		<item>http://www.pfsense.org/packages/config/squid-reverse/squid_cache.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
@@ -159,6 +185,10 @@
 	</additional_files_needed>
 	<fields>
 		<field>
+			<name>Squid General Settings</name>
+			<type>listtopic</type>
+		</field>
+		<field>
 			<fielddescr>Proxy interface</fielddescr>
 			<fieldname>active_interface</fieldname>
 			<description>The interface(s) the proxy server will bind to.</description>
@@ -168,6 +198,23 @@
 			<multiple/>
 		</field>
 		<field>
+			<fielddescr>Proxy port</fielddescr>
+			<fieldname>proxy_port</fieldname>
+			<description>This is the port the proxy server will listen on.</description>
+			<type>input</type>
+			<size>5</size>
+			<required/>
+			<default_value>3128</default_value>
+		</field>
+		<field>
+			<fielddescr>ICP port</fielddescr>
+			<fieldname>icp_port</fieldname>
+			<description>This is the port the Proxy Server will send and receive ICP queries to and from neighbor caches. Leave this blank if you don't want the proxy server to communicate with neighbor caches through ICP.</description>
+			<type>input</type>
+			<size>5</size>
+		</field>
+
+		<field>
 			<fielddescr>Allow users on interface</fielddescr>
 			<fieldname>allow_interface</fieldname>
 			<description>If this field is checked, the users connected to the interface selected in the 'Proxy interface' field will be allowed to use the proxy, i.e., there will be no need to add the interface's subnet to the list of allowed subnets. This is just a shortcut.</description>
@@ -194,14 +241,25 @@
 			<fieldname>defined_ip_proxy_off</fieldname>
 			<description>Do not forward traffic from these &lt;b&gt;source&lt;/b&gt; IPs, CIDR nets, hostnames, or aliases through the proxy server but directly through the firewall. Separate by semi-colons (;). [Applies only to transparent mode]</description>
 			<type>input</type>
-  		<size>80</size>
+  		<size>70</size>
 		</field>
 		<field>
 			<fielddescr>Bypass proxy for these destination IPs</fielddescr>
 			<fieldname>defined_ip_proxy_off_dest</fieldname>
 			<description>Do not proxy traffic going to these &lt;b&gt;destination&lt;/b&gt; IPs, CIDR nets, hostnames, or aliases, but let it pass directly through the firewall. Separate by semi-colons (;). [Applies only to transparent mode]</description>
 			<type>input</type>
-		<size>80</size>
+		<size>70</size>
+		</field>
+		<field>
+			<fielddescr>Use alternate DNS-servers for the proxy-server</fielddescr>
+			<fieldname>dns_nameservers</fieldname>
+			<description>If you want to use other DNS-servers than the DNS-forwarder, enter the IPs here, separated by semi-colons (;).</description>
+			<type>input</type>
+			<size>70</size>
+		</field>
+		<field>
+			<name>Logging Settings</name>
+			<type>listtopic</type>
 		</field>
 		<field>
 			<fielddescr>Enabled logging</fielddescr>
@@ -227,22 +285,6 @@
 			<size>5</size>
 		</field>
 		<field>
-			<fielddescr>Proxy port</fielddescr>
-			<fieldname>proxy_port</fieldname>
-			<description>This is the port the proxy server will listen on.</description>
-			<type>input</type>
-			<size>5</size>
-			<required/>
-			<default_value>3128</default_value>
-		</field>
-		<field>
-			<fielddescr>ICP port</fielddescr>
-			<fieldname>icp_port</fieldname>
-			<description>This is the port the Proxy Server will send and receive ICP queries to and from neighbor caches. Leave this blank if you don't want the proxy server to communicate with neighbor caches through ICP.</description>
-			<type>input</type>
-			<size>5</size>
-		</field>
-		<field>
 			<fielddescr>Visible hostname</fielddescr>
 			<fieldname>visible_hostname</fieldname>
 			<description>This is the URL to be displayed in proxy server error messages.</description>
@@ -307,26 +349,34 @@
 			</options>
 		</field>
 		<field>
-			<fielddescr>Use alternate DNS-servers for the proxy-server</fielddescr>
-			<fieldname>dns_nameservers</fieldname>
-			<description>If you want to use other DNS-servers than the DNS-forwarder, enter the IPs here, separated by semi-colons (;).</description>
-			<type>input</type>
-			<size>60</size>
-		</field>
-		<field>
 			<fielddescr>Suppress Squid Version</fielddescr>
 			<fieldname>disable_squidversion</fieldname>
 			<description>If set, suppress Squid version string info in HTTP headers and HTML error pages.</description>
 			<type>checkbox</type>
 		</field>
-    <field>
-			<fielddescr>Custom Options</fielddescr>
+		<field>
+			<name>Custom Settings</name>
+			<type>listtopic</type>
+		</field>
+	    <field>
+			<fielddescr>Integrations</fielddescr>
 			<fieldname>custom_options</fieldname>
-			<description>You can put your own custom options here, separated by semi-colons (;). They'll be added to the configuration. They need to be squid.conf native options, otherwise squid will NOT work.</description>
+			<description><![CDATA[Squid options added from packages like squidguard or havp for squid integration.]]></description>
 			<type>textarea</type>
-			<cols>65</cols>
+			<encoding>base64</encoding>
+			<cols>78</cols>
 			<rows>5</rows>
 		</field>
+	    <field>
+			<fielddescr>Custom Options</fielddescr>
+			<fieldname>custom_options_squid3</fieldname>
+			<description><![CDATA[Put your own custom options here,one per line. They'll be added to the configuration.<br>
+						<strong>They need to be squid.conf native options, otherwise squid will NOT work.</strong>]]></description>
+			<type>textarea</type>
+			<encoding>base64</encoding>
+			<cols>78</cols>
+			<rows>10</rows>
+		</field>
 	</fields>
 	<custom_php_command_before_form>
 		squid_before_form_general(&amp;$pkg);