The Squid package... Countless changes. You might need some stuff from HEAD to make this work properly (you need make_dirs from HEAD to at least install it). This might not work out of the box. In fact, it should not work out of the box in RELENG_1. Please be patient.

1 files changed, 54 insertions, 70 deletions

diff --git a/packages/squid_cache.xml b/packages/squid_cache.xml
index 33fc5f5e..b70c1052 100644
--- a/packages/squid_cache.xml
+++ b/packages/squid_cache.xml
@@ -1,93 +1,81 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <packagegui>
+	<include_file>squid.inc</include_file>
 	<name>squidcache</name>
-	<title>Services: Proxy Server -> Cache Management</title>		
-	<configpath>installedpackages->package->squidcache->configuration->settings</configpath>
-		
-	<aftersaveredirect>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</aftersaveredirect>
-
+	<title>Proxy server: Cache management</title>		
 	<tabs>
 		<tab>
-			<text>General Settings</text>
-			<url>/pkg_edit.php?xml=squid_ng.xml&amp;id=0</url>
+			<text>General settings</text>
+			<url>/pkg_edit.php?xml=squid.xml&amp;id=0</url>
 		</tab>
-		
 		<tab>
-			<text>Upstream Proxy</text>
+			<text>Upstream proxy</text>
 			<url>/pkg_edit.php?xml=squid_upstream.xml&amp;id=0</url>
 		</tab>
-		
 		<tab>
-			<text>Cache Mgmt</text>
+			<text>Cache management</text>
 			<url>/pkg_edit.php?xml=squid_cache.xml&amp;id=0</url>
 			<active/>
 		</tab>
-			
 		<tab>
-			<text>Network Access Control</text>
+			<text>Access control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 		</tab>
-			
 		<tab>
-			<text>Traffic Mgmt</text>
+			<text>Traffic management</text>
 			<url>/pkg_edit.php?xml=squid_traffic.xml&amp;id=0</url>
 		</tab>
-			
 		<tab>
-			<text>Auth Settings</text>
+			<text>Auth settings</text>
 			<url>/pkg_edit.php?xml=squid_auth.xml&amp;id=0</url>
 		</tab>
-		
 		<tab>
-			<text>Extended Auth Settings</text>
-			<url>/pkg.php?xml=squid_extauth.xml&amp;id=0</url>
+			<text>Local users</text>
+			<url>/pkg.php?xml=squid_users.inc</url>
 		</tab>
 	</tabs>
-	
 	<fields>
 		<field>
-			<fielddescr>Memory Cache Size (MB)</fielddescr>
-			<fieldname>memory_cache_size</fieldname>
-			<description>This is the amount of physical RAM to be used for negative cache and in-transit objects.  This value should not exceed more than 50% of installed RAM.  The minimum value is 1MB; the default is 8MB</description>
-			<size>4</size>
+			<fielddescr>Hard disk cache size</fielddescr>
+			<fieldname>harddisk_cache_size</fieldname>
+			<description>This is the amount of disk space (in megabytes) to use for cached objects.</description>
+			<required/>
+			<default_value>100</default_value>
 			<type>input</type>
-			<validation>number</validation>
 		</field>
-		
 		<field>
-			<fielddescr>Hard Disk Cache Size (MB)</fielddescr>
-			<fieldname>harddisk_cache_size</fieldname>
-			<description>This is the amount of disk space (MB) to use for cached objects.  The default is 50MB.</description>
-			<size>4</size>
+			<fielddescr>Memory cache size</fielddescr>
+			<fieldname>memory_cache_size</fieldname>
+			<description>This is the amount of physical RAM (in megabytes) to be used for negative cache and in-transit objects.  This value should not exceed more than 50% of the installed RAM. The minimum value is 1MB.</description>
+			<required/>
+			<default_value>8</default_value>
 			<type>input</type>
-			<validation>number</validation>
 		</field>
-		
 		<field>
-			<fielddescr>Minimum Object Size (KB)</fielddescr>
+			<fielddescr>Minimum object size</fielddescr>
 			<fieldname>minimum_object_size</fieldname>
-			<description>Objects smaller than the size specified will not be saved on disk.  This value is specified in kilobytes and the default is 0, meaning there is no minimum.</description>
-			<size>4</size>
+			<description>Objects smaller than the size specified (in kilobytes) will not be saved on disk. The default value is 0, meaning there is no minimum.</description>
+			<required/>
+			<default_value>0</default_value>
 			<type>input</type>
-			<validation>number</validation>
 		</field>
-		
 		<field>
-			<fielddescr>Maximum Object Size (KB)</fielddescr>
+			<fielddescr>Maximum object size</fielddescr>
 			<fieldname>maximum_object_size</fieldname>
-			<description>Objects larger than the size specified will not be saved on disk.  This value is specified in kilobytes and the default is 4MB.  If you wish to increase speed more than you want to save bandwidth, this should be set to a low value.</description>
-			<size>4</size>
+			<description>Objects larger than the size specified (in kilobytes) will not be saved on disk. If you wish to increase speed more than you want to save bandwidth, this should be set to a low value.</description>
+			<required/>
+			<default_value>4</default_value>
 			<type>input</type>
-			<validation>number</validation>
 		</field>
-		
 		<field>
-			<fielddescr>Number of Level-1 Subdirectories</fielddescr>
-			<fieldname>level_subdirs</fieldname>
-			<description>The default for this value is 16.  Each level-1 directory contains 256 subdirectories, so a value of 256 level-1 directories will use a total of 65536 directories for the hard disk cache.  This will significantly slow down the startup process of the proxy service, but can speed up the caching under certain conditions.</description>
+			<fielddescr>Level 1 subdirectories</fielddescr>
+			<fieldname>level1_subdirs</fieldname>
+			<description>Each level-1 directory contains 256 subdirectories, so a value of 256 level-1 directories will use a total of 65536 directories for the hard disk cache.  This will significantly slow down the startup process of the proxy service, but can speed up the caching under certain conditions.</description>
+			<default_value>16</default_value>
 			<type>select</type>
 			<options>
+				<option><name>4</name><value>4</value></option>
+				<option><name>8</name><value>8</value></option>
 				<option><name>16</name><value>16</value></option>
 				<option><name>32</name><value>32</value></option>
 				<option><name>64</name><value>64</value></option>
@@ -95,11 +83,11 @@
 				<option><name>256</name><value>256</value></option>
 			</options>
 		</field>
-		
 		<field>
-			<fielddescr>Memory Replacement Policy</fielddescr>
+			<fielddescr>Memory replacement policy</fielddescr>
 			<fieldname>memory_replacement</fieldname>
 			<description>The memory replacement policy determines which objects are purged from memory when space is needed.  The default policy for memory replacement is GSDF.  &lt;p&gt; &lt;b&gt; LRU: Last Recently Used Policy &lt;/b&gt; - The LRU policies keep recently referenced objects.  i.e., it replaces the object that has not been accessed for the longest time. &lt;p&gt; &lt;b&gt; Heap GSDF: Greedy-Dual Size Frequency &lt;/b&gt; - The Heap GSDF policy optimizes object-hit rate by keeping smaller, popular objects in cache.  It achieves a lower byte hit rate than LFUDA though, since it evicts larger (possibly popular) objects.  &lt;p&gt; &lt;b&gt; Heap LFUDA: Least Frequently Used with Dynamic Aging &lt;/b&gt; - The Heap LFUDA policy keeps popular objects in cache regardless of their size and thus optimizes byte hit rate at the expense of hit rate since one large, popular object will prevent many smaller, slightly less popular objects from being cached.  &lt;p&gt; &lt;b&gt; Heap LRU: Last Recently Used &lt;/b&gt; - Works like LRU, but uses a heap instead. &lt;p&gt; Note: If using the LFUDA replacement policy, the value of Maximum Object Size should be increased above its default of 4096 KB to maximuze the potential byte hit rate improvement of LFUDA.</description>
+			<default_value>heap GSDF</default_value>
 			<type>select</type>
 			<options>
 				<option><name>LRU</name><value>lru</value></option>
@@ -108,11 +96,11 @@
 				<option><name>Heap LRU</name><value>heap LRU</value></option>
 			</options>
 		</field>
-		
 		<field>
-			<fielddescr>Cache Replacement Policy</fielddescr>
+			<fielddescr>Cache replacement policy</fielddescr>
 			<fieldname>cache_replacement</fieldname>
 			<description>The cache replacement policy decides which objects will remain in cache and which objects are replaced to create space for the new objects.  The default policy for cache replacement is LFUDA.  Please see the type descriptions specified in the memory replacement policy for additional detail.</description>
+			<default_value>heap LFUDA</default_value>
 			<type>select</type>
 			<options>
 				<option><name>LRU</name><value>lru</value></option>
@@ -121,30 +109,26 @@
 				<option><name>Heap LRU</name><value>heap LRU</value></option>
 			</options>
 		</field>
-	
 		<field>
-			<fielddescr>Domain</fielddescr>
-			<fieldname>domain</fieldname>
-			<description>If required, the specified domains will never be cached.  Enter domains separated by a semicolon (;).</description>
+			<fielddescr>Do not cache</fielddescr>
+			<fieldname>donotcache</fieldname>
+			<description>The specified domains or IP addresses (separated by commas) will never be cached.</description>
 			<type>textarea</type>
-			<rows>10</rows>
+			<rows>5</rows>
 			<cols>50</cols>
 		</field>
-
 		<field>
-			<fielddescr>Enable Offline Mode</fielddescr>
+			<fielddescr>Enable offline mode</fielddescr>
 			<fieldname>enable_offline</fieldname>
-			<description></description>
+			<description>Enable this option and the proxy server will never try to validate cached objects. The offline mode gives access to more cached information than the proposed feature would allow (stale cached versions, where the origin server should have been contacted).</description>
+			<required/>
 			<type>checkbox</type>
 		</field>
-					
 	</fields>
-	
-	<custom_add_php_command_late>	
-		require_once("/usr/local/pkg/squid_ng.inc");
-
-		global_write_squid_config();
-		mwexec("/usr/local/sbin/squid -k reconfigure");
-	</custom_add_php_command_late>
-	
-</packagegui>
\ No newline at end of file
+	<custom_php_validation_command>
+		squid_validate_cache($_POST, &amp;$input_errors);
+	</custom_php_validation_command>
+	<custom_php_resync_config_command>
+		squid_resync();
+	</custom_php_resync_config_command>
+</packagegui>