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, 45 insertions, 56 deletions

diff --git a/packages/squid_nac.xml b/packages/squid_nac.xml
index 3b4833e8..bcf25a8e 100644
--- a/packages/squid_nac.xml
+++ b/packages/squid_nac.xml
@@ -1,112 +1,101 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <packagegui>
+	<include_file>squid.inc</include_file>
 	<name>squidnac</name>
-	<title>Services: Proxy Server -> Network Access Control</title>		
-	<configpath>installedpackages->package->squidnac->configuration->settings</configpath>		
-
-	<aftersaveredirect>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</aftersaveredirect>
-
+	<title>Proxy server: Access control</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>
 		</tab>
-			
 		<tab>
-			<text>Network Access Control</text>
+			<text>Access control</text>
 			<url>/pkg_edit.php?xml=squid_nac.xml&amp;id=0</url>
 			<active/>
 		</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>
-		</tab>		
+			<text>Local users</text>
+			<url>/pkg.php?xml=squid_users.inc</url>
+		</tab>
 	</tabs>
-	
 	<fields>
 		<field>
-			<fielddescr>Allowed Subnets</fielddescr>
 			<fieldname>allowed_subnets</fieldname>
-			<description>Subnets must be entered in the format of Network Address / Subnet Mask (e.g.: 192.168.1.0/24).  Enter domains separated by a semicolon (;).</description>
+			<fielddescr>Allowed subnets</fielddescr>
+			<description>Those are the subnets (separated by commas) that are allowed to use the proxy. The subnets must be expressed as CIDR ranges (e.g.: 192.168.1.0/24). Note that the proxy interface subnet is already an allowed subnet. All the other subnets won't be able to use the proxy.</description>
 			<type>textarea</type>
 			<rows>5</rows>
 			<cols>50</cols>
 		</field>
-		
 		<field>
-			<fielddescr>Unrestricted IP Addresses</fielddescr>
-			<fieldname>unrestricted_ip_address</fieldname>
-			<description>Specify each unrestricted IP address separated by a semicolon (;).</description>
+			<fieldname>unrestricted_hosts</fieldname>
+			<fielddescr>Unrestricted IPs</fielddescr>
+			<description>The IP addresses specified here (separated by commas) won't be filtered out by the other access control directives set in this page.</description>
 			<type>textarea</type>
 			<rows>5</rows>
 			<cols>50</cols>
 		</field>
-		
 		<field>
+			<fieldname>unrestricted_macs</fieldname>
 			<fielddescr>Unrestricted MAC Addresses</fielddescr>
-			<fieldname>unrestricted_mac_addresses</fieldname>
-			<description>Specify each unrestricted MAC address separated by a semicolon (;).</description>
+			<description>The MAC addresses specified here (separated by commas) won't be filtered out by the other access control directives set in this page.</description>
 			<type>textarea</type>
 			<rows>5</rows>
-			<cols>50</cols>		
+			<cols>50</cols>
 		</field>
-		
 		<field>
-			<fielddescr>Banned IP Addresses</fielddescr>
-			<fieldname>banned_ip_addresses</fieldname>
-			<description>Specify each banned IP address separated by a semicolon (l).</description>
+			<fieldname>banned_hosts</fieldname>
+			<fielddescr>Banned host addresses</fielddescr>
+			<description>The IP addresses specified here (separated by commas) won't be allowed to use the proxy.</description>
 			<type>textarea</type>
 			<rows>5</rows>
 			<cols>50</cols>
 		</field>	
-		
 		<field>
-			<fielddescr>Banned MAC Addresses</fielddescr>
-			<fieldname>banned_mac_addresses</fieldname>
-			<description>Specify each banned MAC address separated by a semicolon (;).</description>
+			<fieldname>banned_macs</fieldname>
+			<fielddescr>Banned MAC addresses</fielddescr>
+			<description>The MAC addresses specified here (separated by commas) won't be allowed to use the proxy.</description>
+			<type>textarea</type>
+			<rows>5</rows>
+			<cols>50</cols>
+		</field>
+		<field>
+			<fieldname>whitelist</fieldname>
+			<fielddescr>Whitelist</fielddescr>
+			<description>Those are the sites (separated by commas) that will be accessable to the users that are allowed to use the proxy.</description>
 			<type>textarea</type>
 			<rows>5</rows>
 			<cols>50</cols>
 		</field>
-		
 		<field>
-			<fielddescr>Override Host(s)</fielddescr>
-			<fieldname>override_hosts</fieldname>
-			<description>In order to allow override hosts where proxy authentication, if configured, will be bypassed and allowed transparent, please specify each host (IP or FQDN) separated by a semicolon (;).</description>
+			<fieldname>blacklist</fieldname>
+			<fielddescr>Blacklist</fielddescr>
+			<description>Those are the sites (separated by commas) that will be blocked to the users that are allowed to use the proxy.</description>
 			<type>textarea</type>
 			<rows>5</rows>
 			<cols>50</cols>
 		</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_nac($_POST, &amp;$input_errors);
+	</custom_php_validation_command>
+	<custom_php_resync_config_command>
+		squid_resync();
+	</custom_php_resync_config_command>
+</packagegui>