From 089edbf2d6918f2c7c17e77ff169e22d5345dcc9 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 19 Nov 2010 17:10:32 -0500 Subject: Sync squid3 GUI code with recent changes to squid 2.x gui code, update to a more recent version of squid 3, enable for 2.0 (binaries have already been uploaded) --- config/squid3/squid.inc | 305 ++++++++++++++++++++++++++++----------- config/squid3/squid.xml | 56 ++++--- config/squid3/squid_auth.xml | 29 +++- config/squid3/squid_cache.xml | 25 ++-- config/squid3/squid_extauth.xml | 8 +- config/squid3/squid_nac.xml | 16 +- config/squid3/squid_ng.xml | 4 +- config/squid3/squid_traffic.xml | 14 +- config/squid3/squid_upstream.xml | 16 +- config/squid3/squid_users.xml | 14 +- pkg_config.8.xml | 11 +- pkg_config.8.xml.amd64 | 11 +- 12 files changed, 337 insertions(+), 172 deletions(-) diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc index acb5a2d3..98192253 100644 --- a/config/squid3/squid.inc +++ b/config/squid3/squid.inc @@ -2,7 +2,7 @@ /* $Id$ */ /* squid.inc - Copyright (C) 2006 Scott Ullrich + Copyright (C) 2006-2009 Scott Ullrich Copyright (C) 2006 Fernando Lemos Copyright (C) 2008 Martin Fuchs All rights reserved. @@ -40,6 +40,7 @@ if(!function_exists("filter_configure")) require_once("filter.inc"); define('SQUID_CONFBASE', '/usr/local/etc/squid'); +define('SQUID_BASE', '/var/squid/'); define('SQUID_ACLDIR', '/var/squid/acl'); define('SQUID_PASSWD', '/var/etc/squid.passwd'); @@ -64,7 +65,7 @@ function squid_chown_recursive($dir, $user, $group) { $path = "$dir/$item"; if (is_dir($path)) squid_chown_recursive($path, $user, $group); - else { + elseif (is_file($path)) { chown($path, $user); chgrp($path, $group); } @@ -76,6 +77,11 @@ function squid_chown_recursive($dir, $user, $group) { function squid_dash_z() { global $config; $settings = $config['installedpackages']['squidcache']['config'][0]; + + // If the cache system is null, there is no need to initialize the (irrelevant) cache dir. + if ($settings['harddisk_cache_system'] == "null") + return; + $cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache'); if(!is_dir($cachedir.'/')) { @@ -92,7 +98,8 @@ function squid_dash_z() { mwexec("/usr/local/sbin/squid -z"); } - exec("chmod a+rw /var/squid/cache/swap.state"); + if(file_exists("/var/squid/cache/swap.state")) + exec("chmod a+rw /var/squid/cache/swap.state"); } @@ -105,11 +112,17 @@ function squid_is_valid_acl($acl) { function squid_install_command() { global $config; + global $g; /* migrate existing csv config fields */ $settingsauth = $config['installedpackages']['squidauth']['config'][0]; $settingscache = $config['installedpackages']['squidcache']['config'][0]; $settingsnac = $config['installedpackages']['squidnac']['config'][0]; + /* Set storage system */ + if ($g['platform'] == "nanobsd") { + $config['installedpackages']['squidcache']['config'][0]['harddisk_cache_system'] = 'null'; + } + /* migrate auth settings */ if (!empty($settingsauth['no_auth_hosts'])) { if(strstr($settingsauth['no_auth_hosts'], ",")) { @@ -133,36 +146,42 @@ function squid_install_command() { $config['installedpackages']['squidnac']['config'][0]['allowed_subnets'] = $settingsnac['allowed_subnets']; } } + if(! empty($settingsnac['banned_hosts'])) { if(strstr($settingsnac['banned_hosts'], ",")) { $settingsnac['banned_hosts'] = base64_encode(implode("\n", explode(",", $settingsnac['banned_hosts']))); $config['installedpackages']['squidnac']['config'][0]['banned_hosts'] = $settingsnac['banned_hosts']; } } + if(! empty($settingsnac['banned_macs'])) { if(strstr($settingsnac['banned_macs'], ",")) { $settingsnac['banned_macs'] = base64_encode(implode("\n", explode(",", $settingsnac['banned_macs']))); $config['installedpackages']['squidnac']['config'][0]['banned_macs'] = $settingsnac['banned_macs']; } } + if(! empty($settingsnac['unrestricted_hosts'])) { if(strstr($settingsnac['unrestricted_hosts'], ",")) { $settingsnac['unrestricted_hosts'] = base64_encode(implode("\n", explode(",", $settingsnac['unrestricted_hosts']))); $config['installedpackages']['squidnac']['config'][0]['unrestricted_hosts'] = $settingsnac['unrestricted_hosts']; } } + if(! empty($settingsnac['unrestricted_macs'])) { if(strstr($settingsnac['unrestricted_macs'], ",")) { $settingsnac['unrestricted_macs'] = base64_encode(implode("\n", explode(",", $settingsnac['unrestricted_macs']))); $config['installedpackages']['squidnac']['config'][0]['unrestricted_macs'] = $settingsnac['unrestricted_macs']; } } + if(! empty($settingsnac['whitelist'])) { if(strstr($settingsnac['whitelist'], ",")) { $settingsnac['whitelist'] = base64_encode(implode("\n", explode(",", $settingsnac['whitelist']))); $config['installedpackages']['squidnac']['config'][0]['whitelist'] = $settingsnac['whitelist']; } } + if(! empty($settingsnac['blacklist'])) { if(strstr($settingsnac['blacklist'], ",")) { $settingsnac['blacklist'] = base64_encode(implode("\n", explode(",", $settingsnac['blacklist']))); @@ -206,16 +225,17 @@ if [ -z "`ps auxw | grep "[s]quid -D"|awk '{print $2}'`" ];then fi EOD; - update_status("Writing rc files... One moment please..."); + update_status("Writing rc.d files... One moment please..."); + conf_mount_rw(); write_rcfile($rc); exec("chmod a+rx /usr/local/libexec/squid/dnsserver"); foreach (array( SQUID_CONFBASE, SQUID_ACLDIR, - ) as $dir) { - make_dirs($dir); - squid_chown_recursive($dir, 'proxy', 'proxy'); + SQUID_BASE ) as $dir) { + make_dirs($dir); + squid_chown_recursive($dir, 'proxy', 'proxy'); } /* kill any running proxy alarm scripts */ @@ -249,20 +269,24 @@ EOD; } function squid_deinstall_command() { - global $config; - squid_install_cron(false); - $settings = $config['installedpackages']['squidcache']['config'][0]; + global $config, $g; + $plswait_txt = "This operation may take quite some time, please be patient. Do not press stop or attempt to navigate away from this page during this process."; + squid_install_cron(false); + $settings = &$config['installedpackages']['squidcache']['config'][0]; $cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache'); - $logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/log'); - - mwexec('rm -rf $cachedir'); + $logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs'); + update_status("Removing swap.state ... One moment please..."); + update_output_window("$plswait_txt"); + mwexec('rm -rf $cachedir/swap.state'); mwexec('rm -rf $logdir'); + update_status("Finishing package cleanup."); mwexec('rm -f /usr/local/etc/rc.d/proxy_monitor.sh'); mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill"); mwexec("ps awux | grep \"squid\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill"); mwexec("ps awux | grep \"dnsserver\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill"); mwexec("ps awux | grep \"unlinkd\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill"); - filter_configure(); + update_status("Reloading filter..."); + filter_configure_sync(); } function squid_before_form_general($pkg) { @@ -288,6 +312,10 @@ function squid_before_form_general($pkg) { function squid_validate_general($post, $input_errors) { global $config; + $settings = $config['installedpackages']['squid']['config'][0]; + $port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128); + $port = $post['proxy_port'] ? $post['proxy_port'] : $port; + $icp_port = trim($post['icp_port']); if (!empty($icp_port) && !is_port($icp_port)) $input_errors[] = 'You must enter a valid port number in the \'ICP port\' field'; @@ -322,13 +350,23 @@ function squid_validate_general($post, $input_errors) { if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off'])) { $input_errors[] = "You can not bypass traffic from specific IPs without using the transparent proxy."; - } + } + if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off_dest'])) { + $input_errors[] = "You can not bypass traffic to specific IPs without using the transparent proxy."; + } foreach (array('defined_ip_proxy_off') as $hosts) { foreach (explode(";", $post[$hosts]) as $host) { $host = trim($host); - if (!empty($host) && !is_ipaddr($host)) - $input_errors[] = "The entry '$host' is not a valid IP address"; + if (!empty($host) && !is_ipaddr($host) && !is_alias($host) && !is_hostname($host)) + $input_errors[] = "The entry '$host' is not a valid IP address, hostname, or alias"; + } + } + foreach (array('defined_ip_proxy_off_dest') as $hosts) { + foreach (explode(";", $post[$hosts]) as $host) { + $host = trim($host); + if (!empty($host) && !is_ipaddr($host) && !is_alias($host) && !is_hostname($host)) + $input_errors[] = "The entry '$host' is not a valid IP address, hostname, or alias"; } } @@ -532,7 +570,7 @@ function squid_install_cron($should_install) { return; $x=0; foreach($config['cron']['item'] as $item) { - if(strstr($item['command'], "/usr/local/sbin/squid")) { + if(strstr($item['task_name'], "squid_rotate_logs")) { $is_installed = true; break; } @@ -542,6 +580,7 @@ function squid_install_cron($should_install) { case true: if(!$is_installed) { $cron_item = array(); + $cron_item['task_name'] = "squid_rotate_logs"; $cron_item['minute'] = "0"; $cron_item['hour'] = "0"; $cron_item['mday'] = "*"; @@ -585,8 +624,7 @@ function squid_resync_general() { } } if (($settings['transparent_proxy'] == 'on')) { - $conf .= "http_port 127.0.0.1:80 transparent\n"; // for squid < v.3.1 (for pf) -// $conf .= "http_port 127.0.0.1:80 intercept\n"; // new from squid >= 3.1 (for pf) + $conf .= "http_port 127.0.0.1:80 transparent\n"; } $icp_port = ($settings['icp_port'] ? $settings['icp_port'] : 0); @@ -597,7 +635,7 @@ function squid_resync_general() { $hostname = ($settings['visible_hostname'] ? $settings['visible_hostname'] : 'localhost'); $email = ($settings['admin_email'] ? $settings['admin_email'] : 'admin@localhost'); - $logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/log'); + $logdir = ($settings['log_dir'] ? $settings['log_dir'] : '/var/squid/logs'); $logdir_cache = $logdir . '/cache.log'; $logdir_access = ($settings['log_enabled'] == 'on' ? $logdir . '/access.log' : '/dev/null'); @@ -647,7 +685,7 @@ EOD; if ($settings['disable_squidversion']) $conf .= "httpd_suppress_version_string on\n"; if (!empty($settings['uri_whitespace'])) $conf .= "uri_whitespace {$settings['uri_whitespace']}\n"; else $conf .= "uri_whitespace strip\n"; //only used for first run - + if(!empty($settings['dns_nameservers'])) { $altdns = explode(";", ($settings['dns_nameservers'])); $conf .= "dns_nameservers "; @@ -662,13 +700,12 @@ EOD; function squid_resync_cache() { - global $config; + global $config, $g; $settings = $config['installedpackages']['squidcache']['config'][0]; $cachedir =($settings['harddisk_cache_location'] ? $settings['harddisk_cache_location'] : '/var/squid/cache'); $disk_cache_size = ($settings['harddisk_cache_size'] ? $settings['harddisk_cache_size'] : 100); - $disk_cache_system = ($settings['harddisk_cache_system'] ? $settings['harddisk_cache_system'] : 'aufs'); $level1 = ($settings['level1_subdirs'] ? $settings['level1_subdirs'] : 16); $memory_cache_size = ($settings['memory_cache_size'] ? $settings['memory_cache_size'] : 8); $max_objsize = ($settings['maximum_object_size'] ? $settings['maximum_object_size'] : 10); @@ -677,15 +714,31 @@ function squid_resync_cache() { $memory_policy = ($settings['memory_replacement_policy'] ? $settings['memory_replacement_policy'] : 'heap GDSF'); $offline_mode = ($settings['enable_offline'] == 'on' ? 'on' : 'off'); + if (!isset($settings['harddisk_cache_system'])) { + if ($g['platform'] == "nanobsd") { + $disk_cache_system = 'null'; + } else { + $disk_cache_system = 'ufs'; + } + } else { + $disk_cache_system = $settings['harddisk_cache_system']; + } + + if ($disk_cache_system == "null") { + $disk_cache_opts = "{$disk_cache_system} /tmp"; + } else { + $disk_cache_opts = "{$disk_cache_system} {$cachedir} {$disk_cache_size} {$level1} 256"; + } + $conf = << diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml index 662805da..fe648a18 100644 --- a/config/squid3/squid.xml +++ b/config/squid3/squid.xml @@ -46,7 +46,7 @@ Describe your package requirements here Currently there are no FAQ items provided. squid - 3.0.8 + 2.6.STABLE18 Proxy server: General settings /usr/local/pkg/squid.inc @@ -63,32 +63,32 @@ - General settings + General /pkg_edit.php?xml=squid.xml&id=0 - Upstream proxy + Upstream Proxy /pkg_edit.php?xml=squid_upstream.xml&id=0 - Cache management + Cache Mgmt /pkg_edit.php?xml=squid_cache.xml&id=0 - Access control + Access Control /pkg_edit.php?xml=squid_nac.xml&id=0 - Traffic management + Traffic Mgmt /pkg_edit.php?xml=squid_traffic.xml&id=0 - Auth settings + Auth Settings /pkg_edit.php?xml=squid_auth.xml&id=0 - Local users + Local Users /pkg.php?xml=squid_users.xml @@ -96,52 +96,52 @@ /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/squid3/squid.inc + http://www.pfsense.org/packages/config/squid/squid.inc /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/squid3/squid_cache.xml + http://www.pfsense.org/packages/config/squid/squid_cache.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/squid3/squid_nac.xml + http://www.pfsense.org/packages/config/squid/squid_nac.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/squid3/squid_ng.xml + http://www.pfsense.org/packages/config/squid/squid_ng.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/squid3/squid_traffic.xml + http://www.pfsense.org/packages/config/squid/squid_traffic.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/squid3/squid_upstream.xml + http://www.pfsense.org/packages/config/squid/squid_upstream.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/squid3/squid_auth.xml + http://www.pfsense.org/packages/config/squid/squid_auth.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/squid3/squid_users.xml + http://www.pfsense.org/packages/config/squid/squid_users.xml /usr/local/etc/rc.d/ 0755 - http://www.pfsense.org/packages/config/squid3/proxy_monitor.sh + http://www.pfsense.org/packages/config/squid/proxy_monitor.sh /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/squid3/squid_cache.xml + http://www.pfsense.org/packages/config/squid/squid_cache.xml @@ -177,10 +177,17 @@ Bypass proxy for these source IPs defined_ip_proxy_off - Do not forward traffic from these <b>source</b> IPs through the proxy server but directly through the firewall. Separate by semi-colons (;). + Do not forward traffic from these <b>source</b> IPs, hostnames, or aliases through the proxy server but directly through the firewall. Separate by semi-colons (;). input 80 - + + + Bypass proxy for these destination IPs + defined_ip_proxy_off_dest + Do not proxy traffic going to these <b>destination</b> IPs, hostnames, or aliases, but let it pass directly through the firewall. Separate by semi-colons (;). + input + 80 + Enabled logging log_enabled @@ -195,7 +202,7 @@ input 60 - /var/squid/log + /var/squid/logs Log rotate @@ -296,8 +303,8 @@ disable_squidversion If set, suppress Squid version string info in HTTP headers and HTML error pages. checkbox - - + + Custom Options custom_options 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. @@ -330,4 +337,5 @@ squid_deinstall_command(); exec("/bin/rm -f /usr/local/etc/rc.d/squid*"); - + squid_generate_rules + \ No newline at end of file diff --git a/config/squid3/squid_auth.xml b/config/squid3/squid_auth.xml index b3e7c5c1..c8e34553 100644 --- a/config/squid3/squid_auth.xml +++ b/config/squid3/squid_auth.xml @@ -51,32 +51,32 @@ squid.inc - General settings + General /pkg_edit.php?xml=squid.xml&id=0 - Upstream proxy + Upstream Proxy /pkg_edit.php?xml=squid_upstream.xml&id=0 - Cache management + Cache Mgmt /pkg_edit.php?xml=squid_cache.xml&id=0 - Access control + Access Control /pkg_edit.php?xml=squid_nac.xml&id=0 - Traffic management + Traffic Mgmt /pkg_edit.php?xml=squid_traffic.xml&id=0 - Auth settings + Auth Settings /pkg_edit.php?xml=squid_auth.xml&id=0 - Local users + Local Users /pkg.php?xml=squid_users.xml @@ -122,6 +122,13 @@ input 60 + + NT domain + auth_ntdomain + Enter here the NT domain. + input + 60 + LDAP server user DN ldap_user @@ -143,6 +150,14 @@ input 60 + + LDAP username DN attribute + ldap_userattribute + Enter LDAP username DN attibute. + input + 60 + uid + LDAP search filter ldap_filter diff --git a/config/squid3/squid_cache.xml b/config/squid3/squid_cache.xml index f03053b0..881f15b3 100644 --- a/config/squid3/squid_cache.xml +++ b/config/squid3/squid_cache.xml @@ -42,41 +42,41 @@ /* ========================================================================== */ ]]> - Describe your package here - Describe your package requirements here - Currently there are no FAQ items provided. + Describe your package here + Describe your package requirements here + Currently there are no FAQ items provided. squidcache none Proxy server: Cache management squid.inc - General settings + General /pkg_edit.php?xml=squid.xml&id=0 - Upstream proxy + Upstream Proxy /pkg_edit.php?xml=squid_upstream.xml&id=0 - Cache management + Cache Mgmt /pkg_edit.php?xml=squid_cache.xml&id=0 - Access control + Access Control /pkg_edit.php?xml=squid_nac.xml&id=0 - Traffic management + Traffic Mgmt /pkg_edit.php?xml=squid_traffic.xml&id=0 - Auth settings + Auth Settings /pkg_edit.php?xml=squid_auth.xml&id=0 - Local users + Local Users /pkg.php?xml=squid_users.xml @@ -92,13 +92,14 @@ Hard disk cache system harddisk_cache_system - This specifies the kind of storage system to use. <p> <b> ufs </b> is the old well-known Squid storage format that has always been there. <p> <b> aufs </b> uses POSIX-threads to avoid blocking the main Squid process on disk-I/O. (Formerly known as async-io.) <p> <b> diskd </b> uses a separate process to avoid blocking the main Squid process on disk-I/O. + This specifies the kind of storage system to use. <p> <b> ufs </b> is the old well-known Squid storage format that has always been there. <p> <b> aufs </b> uses POSIX-threads to avoid blocking the main Squid process on disk-I/O. (Formerly known as async-io.) <p> <b> diskd </b> uses a separate process to avoid blocking the main Squid process on disk-I/O. <p> <b> null </b> Does not use any storage. Ideal for Embedded/NanoBSD. select - aufs + ufs + diff --git a/config/squid3/squid_extauth.xml b/config/squid3/squid_extauth.xml index 745e85d5..41d9f633 100644 --- a/config/squid3/squid_extauth.xml +++ b/config/squid3/squid_extauth.xml @@ -51,7 +51,7 @@ /pkg_edit.php?xml=squid_extauth.xml&id=0 - General Settings + General /pkg_edit.php?xml=squid_ng.xml&id=0 @@ -66,7 +66,7 @@ - Network Access Control + Access Control /pkg_edit.php?xml=squid_nac.xml&id=0 @@ -76,12 +76,12 @@ - Auth Settings + Auth /pkg_edit.php?xml=squid_auth.xml&id=0 - Extended Auth Settings + Extended Auth /pkg_edit.php?xml=squid_extauth.xml&id=0 diff --git a/config/squid3/squid_nac.xml b/config/squid3/squid_nac.xml index 56e3fa8b..193a89c6 100644 --- a/config/squid3/squid_nac.xml +++ b/config/squid3/squid_nac.xml @@ -51,32 +51,32 @@ squid.inc - General settings + General /pkg_edit.php?xml=squid.xml&id=0 - Upstream proxy + Upstream Proxy /pkg_edit.php?xml=squid_upstream.xml&id=0 - Cache management + Cache Mgmt /pkg_edit.php?xml=squid_cache.xml&id=0 - Access control + Access Control /pkg_edit.php?xml=squid_nac.xml&id=0 - Traffic management + Traffic Mgmt /pkg_edit.php?xml=squid_traffic.xml&id=0 - Auth settings + Auth Settings /pkg_edit.php?xml=squid_auth.xml&id=0 - Local users + Local Users /pkg.php?xml=squid_users.xml @@ -132,7 +132,7 @@ Enter the IPs for the external Cache Managers to be allowed here, separated by semi-colons (;). input 60 - + squid_validate_nac($_POST, &$input_errors); diff --git a/config/squid3/squid_ng.xml b/config/squid3/squid_ng.xml index 5949606e..5d956387 100644 --- a/config/squid3/squid_ng.xml +++ b/config/squid3/squid_ng.xml @@ -90,11 +90,11 @@ /pkg_edit.php?xml=squid_traffic.xml&id=0 - Auth Settings + Auth /pkg_edit.php?xml=squid_auth.xml&id=0 - Extended Auth Settings + Extended Auth /pkg_edit.php?xml=squid_extauth.xml&id=0 diff --git a/config/squid3/squid_traffic.xml b/config/squid3/squid_traffic.xml index 1330cac9..d560a7ad 100644 --- a/config/squid3/squid_traffic.xml +++ b/config/squid3/squid_traffic.xml @@ -51,32 +51,32 @@ squid.inc - General settings + General /pkg_edit.php?xml=squid.xml&id=0 - Upstream proxy + Upstream Proxy /pkg_edit.php?xml=squid_upstream.xml&id=0 - Cache management + Cache Mgmt /pkg_edit.php?xml=squid_cache.xml&id=0 - Access control + Access Control /pkg_edit.php?xml=squid_nac.xml&id=0 - Traffic management + Traffic Mgmt /pkg_edit.php?xml=squid_traffic.xml&id=0 - Auth settings + Auth Settings /pkg_edit.php?xml=squid_auth.xml&id=0 - Local users + Local Users /pkg.php?xml=squid_users.xml diff --git a/config/squid3/squid_upstream.xml b/config/squid3/squid_upstream.xml index 1102c672..ad494524 100644 --- a/config/squid3/squid_upstream.xml +++ b/config/squid3/squid_upstream.xml @@ -51,33 +51,33 @@ squid.inc - General settings + General /pkg_edit.php?xml=squid.xml&id=0 - Upstream proxy + Upstream Proxy /pkg_edit.php?xml=squid_upstream.xml&id=0 - Cache management + Cache Mgmt /pkg_edit.php?xml=squid_cache.xml&id=0 - Access control + Access Control /pkg_edit.php?xml=squid_nac.xml&id=0 - Traffic management + Traffic Mgmt /pkg_edit.php?xml=squid_traffic.xml&id=0 - Auth settings + Auth Settings /pkg_edit.php?xml=squid_auth.xml&id=0 - Local users - /pkg.php?xml=squid_users.in + Local Users + /pkg.php?xml=squid_users.xml diff --git a/config/squid3/squid_users.xml b/config/squid3/squid_users.xml index 34260817..eef6389f 100644 --- a/config/squid3/squid_users.xml +++ b/config/squid3/squid_users.xml @@ -53,31 +53,31 @@ A proxy server user has been created/modified. - General settings + General /pkg_edit.php?xml=squid.xml&id=0 - Upstream proxy + Upstream Proxy /pkg_edit.php?xml=squid_upstream.xml&id=0 - Cache management + Cache Mgmt /pkg_edit.php?xml=squid_cache.xml&id=0 - Access control + Access Control /pkg_edit.php?xml=squid_nac.xml&id=0 - Traffic management + Traffic Mgmt /pkg_edit.php?xml=squid_traffic.xml&id=0 - Auth settings + Auth Settings /pkg_edit.php?xml=squid_auth.xml&id=0 - Local users + Local Users /pkg.php?xml=squid_users.xml diff --git a/pkg_config.8.xml b/pkg_config.8.xml index ad88b884..0f72def0 100755 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -714,7 +714,7 @@ /usr/ports/www/squid /usr/ports/www/squid_radius_auth /usr/ports/www/libwww - WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_CARP=true WITHOUT_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true + WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_CARP=true WITH_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true http://www.pfsense.org/packages/config/squid/squid.xml squid.xml @@ -723,14 +723,15 @@ EXPERIMENTAL! Not all directives are ported yet! High performance web proxy cache. http://www.squid-cache.org/ Network - 3.0.8_09 + 3.1.9 ALPHA - 3 + 2.0 fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com http://files.pfsense.org/packages/8/All/ - squid-3.0.8.tbz + squid-3.1.9.tbz squid_radius_auth-1.10.tbz openldap-client-2.4.10.tbz + WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_IPV6=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITHOUT_SQUID_IPFW=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_ECAP=true WITH_SQUID_ICAP=true WITHOUT_SQUID_ESI=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITHOUT_SQUID_DEBUG=true http://www.pfsense.org/packages/config/squid3/squid.xml squid.xml true @@ -785,7 +786,7 @@ /usr/ports/databases/db41 /usr/ports/databases/db3 /usr/ports/security/cyrus-sasl2 - WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_CARP=true WITHOUT_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITH_SAMPLE_BL=true WITH_LDAP=true WITH_SASL=true WITH_FETCH=true + WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_CARP=true WITH_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITH_SAMPLE_BL=true WITH_LDAP=true WITH_SASL=true WITH_FETCH=true http://www.pfsense.org/packages/config/squidGuard/squidguard.xml squidguard.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 7d6dd3a4..1340dc67 100755 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -18,7 +18,7 @@ squid-2.7.9.tbz squid_radius_auth-1.10.tbz libwww-5.4.0_4.tbz - WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_CARP=true WITHOUT_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITHOUT_DEBUGGING=true WITHOUT_GDBM=true WITHOUT_PERL_MALLOC=true WITH_PERL_64BITINT=true WITHOUT_THREADS=true WITHOUT_MULTIPLICITY=true WITHOUT_SUIDPERL=true WITHOUT_SITECUSTOMIZE=true WITH_USE_PERL=true + WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_CARP=true WITH_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITHOUT_DEBUGGING=true WITHOUT_GDBM=true WITHOUT_PERL_MALLOC=true WITH_PERL_64BITINT=true WITHOUT_THREADS=true WITHOUT_MULTIPLICITY=true WITHOUT_SUIDPERL=true WITHOUT_SITECUSTOMIZE=true WITH_USE_PERL=true http://www.pfsense.org/packages/config/squid/squid.xml squid.xml @@ -738,14 +738,15 @@ EXPERIMENTAL! Not all directives are ported yet! High performance web proxy cache. http://www.squid-cache.org/ Network - 3.0.8_09 + 3.1.9 ALPHA - 3 + 2.0 fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com http://files.pfsense.org/packages/amd64/8/All/ - squid-3.0.8.tbz + squid-3.1.9.tbz squid_radius_auth-1.10.tbz openldap-client-2.4.10.tbz + WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_IPV6=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITHOUT_SQUID_IPFW=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_ECAP=true WITH_SQUID_ICAP=true WITHOUT_SQUID_ESI=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITHOUT_SQUID_DEBUG=true http://www.pfsense.org/packages/config/squid3/squid.xml squid.xml true @@ -800,7 +801,7 @@ /usr/ports/databases/db41 /usr/ports/databases/db3 /usr/ports/security/cyrus-sasl2 - WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_CARP=true WITHOUT_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITH_SAMPLE_BL=true WITH_LDAP=true WITH_SASL=true WITH_FETCH=true + WITH_SQUID_KERB_AUTH=true WITH_SQUID_LDAP_AUTH=true WITH_SQUID_NIS_AUTH=true WITH_SQUID_SASL_AUTH=true WITH_SQUID_DELAY_POOLS=true WITH_SQUID_SNMP=true WITH_SQUID_CARP=true WITH_SQUID_SSL=true WITHOUT_SQUID_PINGER=true WITHOUT_SQUID_DNS_HELPER=true WITH_SQUID_HTCP=true WITH_SQUID_VIA_DB=true WITH_SQUID_CACHE_DIGESTS=true WITH_SQUID_WCCP=true WITHOUT_SQUID_WCCPV2=true WITHOUT_SQUID_STRICT_HTTP=true WITH_SQUID_IDENT=true WITH_SQUID_REFERER_LOG=true WITHOUT_SQUID_USERAGENT_LOG=true WITH_SQUID_ARP_ACL=true WITH_SQUID_PF=true WITHOUT_SQUID_IPFILTER=true WITH_SQUID_FOLLOW_XFF=true WITH_SQUID_AUFS=true WITH_SQUID_COSS=true WITH_SQUID_KQUEUE=true WITH_SQUID_LARGEFILE=true WITHOUT_SQUID_STACKTRACES=true WITH_SAMPLE_BL=true WITH_LDAP=true WITH_SASL=true WITH_FETCH=true http://www.pfsense.org/packages/config/squidGuard/squidguard.xml squidguard.xml -- cgit v1.2.3