From ae713f06c76f0129e573357642fcca3f08a61eeb Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Fri, 9 Sep 2005 02:48:54 +0000 Subject: Update squid package from Michael Capp --- packages/squid_cache.xml | 61 +++--- packages/squid_nac.xml | 23 +-- packages/squid_ng.xml | 481 +++++++++++++++++++++++++++++++++++++------- packages/squid_traffic.xml | 125 ++++++++++++ packages/squid_upstream.xml | 18 +- 5 files changed, 587 insertions(+), 121 deletions(-) create mode 100644 packages/squid_traffic.xml diff --git a/packages/squid_cache.xml b/packages/squid_cache.xml index 0fd39977..60445a6a 100644 --- a/packages/squid_cache.xml +++ b/packages/squid_cache.xml @@ -2,18 +2,19 @@ - Squid Cache Management + squidcache - installedpackages->package->$packagename->configuration->settings - + ['installedpackages']['package']['squidcache']['configuration']['settings'] + /pkg_edit.php?xml=squid_cache.xml&id=0 + General Settings - /pkg_edit.php?xml=squid1.xml&id=0 + /pkg_edit.php?xml=squid_ng.xml&id=0 @@ -37,7 +38,7 @@ /pkg_edit.php?xml=squid_traffic.xml&id=0 - + @@ -105,10 +107,10 @@ The memory replacement policy determines which objects are purged from memory when space is needed. The default policy for memory replacement is GSDF. <p> <b> LRU: Last Recently Used Policy </b> - The LRU policies keep recently referenced objects. i.e., it replaces the object that has not been accessed for the longest time. <p> <b> Heap GSDF: Greedy-Dual Size Frequency </b> - 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. <p> <b> Heap LFUDA: Least Frequently Used with Dynamic Aging </b> - 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. <p> <b> Heap LRU: Last Recently Used </b> - Works like LRU, but uses a heap instead. <p> 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. select - - - - + + + + @@ -118,34 +120,35 @@ 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. select - - - - + + + + - + - Do not cache these domains - no_cache_domains - rowhelper - - - Domain - domain - If required, the specified domains will never be cached. - input - 40 - - + Domain + domain + If required, the specified domains will never be cached. Only enter one domain per line. + textarea + 10 + 50 - + Enable Offline Mode enable_offline checkbox - + + + + + + + + \ No newline at end of file diff --git a/packages/squid_nac.xml b/packages/squid_nac.xml index 39ab565a..b4e4ff24 100644 --- a/packages/squid_nac.xml +++ b/packages/squid_nac.xml @@ -2,18 +2,19 @@ - Squid Cache Management + squidnac - installedpackages->package->$packagename->configuration->settings - + ['installedpackages']['package']['squidnac']['configuration']['settings'] + /pkg_edit.php?xml=squid_nac.xml&id=0 + General Settings - /pkg_edit.php?xml=squid1.xml&id=0 + /pkg_edit.php?xml=squid_ng.xml&id=0 @@ -37,7 +38,7 @@ /pkg_edit.php?xml=squid_traffic.xml&id=0 - + @@ -107,14 +109,9 @@ Unrestricted IP Addresses unrestricted_ip_address - rowhelper - - - IP Address - unrestricted_ip_address - input - - + textarea + 10 + 50 diff --git a/packages/squid_ng.xml b/packages/squid_ng.xml index f2ae25ac..0df323d5 100644 --- a/packages/squid_ng.xml +++ b/packages/squid_ng.xml @@ -1,12 +1,22 @@ - - Squid - Security - 2.5.10_4 - Alpha - + squidng + Security + 2.5.10_4 + Services: Squid Advanced Proxy + + + ['installedpackages']['package']['squidng']['configuration']['settings'] + /pkg_edit.php?xml=squid_ng.xml&id=0 + + @@ -42,17 +52,19 @@ http://www.pfsense.com/packages/config/squid_traffic.xml - + - + @@ -64,14 +76,10 @@ - - installedpackages->package->$packagename->configuration->settings - General Settings - /pkg_edit.php?xml=squid1.xml&id=0 + /pkg_edit.php?xml=squid_ng.xml&id=0 @@ -95,6 +103,7 @@ /pkg_edit.php?xml=squid_traffic.xml&id=0 + - Listening Interface + Proxy Listening Interface active_interface This defines the active listening interface to which the proxy server will listen for its requests. interfaces_selection @@ -128,6 +138,13 @@ checkbox + + URL Filtering Enabled + urlfilter_enable + This enables the advanced functionality in conjunction with squidGuard to provide an array of URL filtering options. This squidGuard functionality can be additionally configured from Services -> Advanced Proxy Filtering + checkbox + + Log Query Terms log_query_terms @@ -151,6 +168,14 @@ input + + ICP Port + icp_port + This is the port the Proxy Server will send and receive ICP queries to and from neighbor caches. The default value is 0, which means this function is disabled. + 4 + input + + Visible Hostname visible_hostname @@ -209,97 +234,407 @@ - function write_squid_config() { - conf_mount_rw(); - config_lock(); - global $config; + function write_static_squid_config() { + global $config; + $lancfg = $config['interfaces']['lan']; + $lanif = $lancfg['if']; + $lanip = $lancfg['ipaddr']; + $lansa = gen_subnet($lancfg['ipaddr'], $lancfg['subnet']); + $lansn = $lancfg['subnet']; + + $fout = fopen("/usr/local/etc/squid/squid.conf.new","w"); + fwrite($fout, "#\n"); + fwrite($fout, "# This file was automatically generated by the pfSense package manager\n"); + fwrite($fout, "# This default policy enables transparent proxy with no local disk logging\n"); + fwrite($fout, "#\n"); + fwrite($fout, "shutdown_lifetime 5 seconds\n"); + fwrite($fout, "icp_port 0\n"); + fwrite($fout, "\n"); + + fwrite($fout, "http_port 3128\n"); + fwrite($fout, "\n"); - $fout = fopen("/usr/local/etc/squid/squid.conf","w"); + fwrite($fout, "acl QUERY urlpath_regex cgi-bin \?\n"); + fwrite($fout, "no_cache deny QUERY\n"); + if ($domain != "") { + $aclout = fopen("/usr/local/etc/squid/dst_nocache.acl","w"); + $each_domain = explode(" ", $domain); + foreach ($each_domain as $line) { + fwrite($aclout, $line . "\n"); + } + fclose($aclout); + } + fwrite($fout, "\n"); + + fwrite($fout, "pid_filename /var/run/squid.pid\n"); + fwrite($fout, "\n"); - - if ($active_interface != "") { - lan_iface = $active_interface['if']; - listen_ip = $lan_iface['ipaddr']; - iface_subnet_address = gen_subnet($lan_iface['ipaddr'], $lan_iface['subnet']); - iface_subnet_network = $lan_iface['subnet']; - } - - - fwrite($fout, "shutdown_lifetime 5 seconds\n"); - - - fwrite($fout, "icp_port 3130\n"); + fwrite($fout, "cache_mem 8 MB\n"); + fwrite($fout, "cache_dir aufs /usr/local/squid/cache 500 16 256\n"); + fwrite($fout, "\n"); + + fwrite($fout, "error_directory /usr/local/squid/etc/errors/English\n"); + fwrite($fout, "\n"); + + fwrite($fout, "memory_replacement_policy heap LRU\n"); + fwrite($fout, "cache_replacement_policy heap GSDF\n"); + fwrite($fout, "\n"); + + fwrite($fout, "cache_access_log /dev/null\n"); + fwrite($fout, "cache_log /dev/null\n"); + fwrite($fout, "cache_store_log none\n"); + fwrite($fout, "\n"); + + fwrite($fout, "log_mime_hdrs off\n"); + fwrite($fout, "emulate_httpd_log on\n"); + fwrite($fout, "forwarded_for off\n"); fwrite($fout, "\n"); - - if ($http_port == "") $http_port="3128"; - fwrite($fout, "http_port " . $listen_ip . " " . $proxy_port . "\n"); + fwrite($fout, "acl within_timeframe time MTWHFAS 00:00-24:00\n"); + fwrite($fout, "\n"); + + fwrite($fout, "acl all src " . $lansa . "/" . $lansn . "\n"); + fwrite($fout, "acl localnet src " . $lansa . "/" . $lansn . "\n"); + fwrite($fout, "acl localhost src 127.0.0.1/255.255.255.255\n"); + fwrite($fout, "acl SSL_ports port 443 563\n"); + fwrite($fout, "acl Safe_ports port 80 # http\n"); + fwrite($fout, "acl Safe_ports port 21 # ftp\n"); + fwrite($fout, "acl Safe_ports port 443 563 # https, snews\n"); + fwrite($fout, "acl Safe_ports port 70 # gopher\n"); + fwrite($fout, "acl Safe_ports port 210 # wais\n"); + fwrite($fout, "acl Safe_ports port 1025-65535 # unregistered ports\n"); + fwrite($fout, "acl Safe_ports port 280 # http-mgmt\n"); + fwrite($fout, "acl Safe_ports port 488 # gss-http\n"); + fwrite($fout, "acl Safe_ports port 591 # filemaker\n"); + fwrite($fout, "acl Safe_ports port 777 # multiling http\n"); + fwrite($fout, "acl Safe_ports port 800 # Squids port (for icons)\n"); + fwrite($fout, "\n"); + + fwrite($fout, "acl CONNECT method CONNECT\n"); + fwrite($fout, "\n"); + + fwrite($fout, "#access to squid; local machine; no restrictions\n"); + fwrite($fout, "http_access allow localnet\n"); + fwrite($fout, "http_access allow localhost\n"); + fwrite($fout, "\n"); + + fwrite($fout, "#Deny non web services\n"); + fwrite($fout, "http_access deny !Safe_ports\n"); + fwrite($fout, "http_access deny CONNECT\n"); + fwrite($fout, "\n"); + + fwrite($fout, "#Set custom configured ACLs\n"); + fwrite($fout, "http_access deny all\n"); + fwrite($fout, "visible_hostname pfSense\n"); + fwrite($fout, "httpd_accel_host virtual\n"); + fwrite($fout, "httpd_accel_port 80\n"); + fwrite($fout, "httpd_accel_with_proxy on\n"); + fwrite($fout, "httpd_accel_uses_host_header on\n"); + fwrite($fout, "cache_effective_user squid\n"); + fwrite($fout, "cache_effective_group squid\n"); + fwrite($fout, "\n"); + + fwrite($fout, "#Strip HTTP Header\n"); + fwrite($fout, "header_access X-Forwarded-For deny all\n"); + fwrite($fout, "header_access deny all\n"); + fwrite($fout, "\n"); + + fwrite($fout, "maximum_object_size 4096 KB\n"); + fwrite($fout, "minimum_object_size 0 KB\n"); + fwrite($fout, "\n"); + + fwrite($fout, "request_body_max_size 0 KB\n"); + fwrite($fout, "reply_body_max_size 0 allow all\n"); + fwrite($fout, "\n"); + + fclose($fout); + } + + function global_write_squid_config() { + global $config; + + + $squidconfig = "/usr/local/etc/squid/squid.conf.new"; + + + $active_interface = $config['installedpackages']['squidng']['config'][0]['active_interface']; + $transparent_proxy = $config['installedpackages']['squidng']['config'][0]['transparent_proxy']; + $log_enabled = $config['installedpackages']['squidng']['config'][0]['log_enabled']; + $urlfilter_enable = $config['installedpackages']['squidng']['config'][0]['urlfilter_enable']; + $log_query_terms = $config['installedpackages']['squidng']['config'][0]['log_query_terms']; + $log_user_agents = $config['installedpackages']['squidng']['config'][0]['log_user_agents']; + $proxy_port = $config['installedpackages']['squidng']['config'][0]['proxy_port']; + $visible_hostname = $config['installedpackages']['squidng']['config'][0]['visible_hostname']; + $cache_admin_email = $config['installedpackages']['squidng']['config'][0]['cache_admin_email']; + $error_language = $config['installedpackages']['squidng']['config'][0]['error_language']; + + + $proxy_forwarding = $config['installedpackages']['squidupstream']['config'][0]['proxy_forwarding']; + $client_ip_forwarding = $config['installedpackages']['squidupstream']['config'][0]['client_ip_forwarding']; + $user_forwarding = $config['installedpackages']['squidupstream']['config'][0]['user_forwarding']; + $upstream_proxy = $config['installedpackages']['squidupstream']['config'][0]['upstream_proxy']; + $upstream_proxy_port = $config['installedpackages']['squidupstream']['config'][0]['upstream_proxy_port']; + $upstream_username = $config['installedpackages']['squidupstream']['config'][0]['upstream_username']; + $upstream_password = $config['installedpackages']['squidupstream']['config'][0]['upstream_psasword']; + + + $memory_cache_size = $config['installedpackages']['squidcache']['config'][0]['memory_cache_size']; + $harddisk_cache_size = $config['installedpackages']['squidcache']['config'][0]['harddisk_cache_size']; + $minimum_object_size = $config['installedpackages']['squidcache']['config'][0]['minimum_object_size']; + $maximum_object_size = $config['installedpackages']['squidcache']['config'][0]['maximum_object_size']; + $level_subdirs = $config['installedpackages']['squidcache']['config'][0]['level_subdirs']; + $memory_replacement = $config['installedpackages']['squidcache']['config'][0]['memory_replacement']; + $cache_replacement = $config['installedpackages']['squidcache']['config'][0]['cache_replacement']; + + $enable_offline = $config['installedpackages']['squidcache']['config'][0]['enable_offline']; + + + $allowed_subnets = $config['installedpackages']['squidnac']['config'][0]['allowed_subnets']; + + + $unrestricted_ip_address = $config['installedpackages']['squidnac']['config'][0]['unrestricted_ip_address']; + + + $max_download_size = $config['installedpackages']['squidtraffic']['config'][0]['max_download_size']; + $max_upload_size = $config['installedpackages']['squidtraffic']['config'][0]['max_upload_size']; + $dl_overall = $config['installedpackages']['squidtraffic']['config'][0]['dl_overall']; + $dl_per_host = $config['installedpackages']['squidtraffic']['config'][0]['dl_per_host']; + $throttle_binary_files = $config['installedpackages']['squidtraffic']['config'][0]['throttle_binary_files']; + $throttle_cd_image = $config['installedpackages']['squidtraffic']['config'][0]['throttle_cd_image']; + $throttle_multimedia = $config['installedpackages']['squidtraffic']['config'][0]['throttle_multimedia']; + + $fout = fopen($squidconfig,"w"); + + + fwrite($fout, "shutdown_lifetime 5 seconds\n"); + fwrite($fout, "\n"); + + + if($icp_port == "") $icp_port="3130"; + fwrite($fout, "icp_port " . $icp_port . "\n"); + + if($http_port == "") $http_port="3128"; + $int = convert_friendly_interface_to_real_interface_name($config['installedpackages']['squidng']['config'][0]['active_interface']); + $listen_ip = find_interface_ip($int); + fwrite($fout, "http_port " . $listen_ip . ":" . $http_port . "\n"); fwrite($fout, "\n"); - fwrite($fout, "acl QUERY urlpath_regex cgi-bin \?\n"); fwrite($fout, "non_cache deny QUERY\n"); - + + fwrite($fout, "\n"); + fwrite($fout, "cache_effective_user squid\n"); fwrite($fout, "cache_effective_group squid\n"); + fwrite($fout, "\n"); - fwrite($fout, "pid_filename /var/run/squid.pid\n"); - + fwrite($fout, "\n"); + + if ($memory_cache_size == "") $memory_cache_size="8"; + fwrite($fout, "cache_mem " . $memory_cache_size . " MB\n"); + if ($harddisk_cache_size == "") $harddisk_cache_size="500"; + if ($level_subdirs == "") $level_subdirs="16"; + fwrite($fout, "cache_dirs aufs /usr/local/squid/cache " . $harddisk_cache_size . " " . $level_subdirs . " 256\n"); + fwrite($fout, "\n"); + + if ($error_language == "") $error_language="English"; + fwrite($fout, "error_directory /usr/local/squid/etc/errors/" . $error_language . "\n"); + fwrite($fout, "\n"); + + if ($offline_mode == "on") { + fwrite($fout, "offline_mode on\n"); + fwrite($fout, "\n"); + } + + if ($memory_replacement == "") $memory_replacement="heap GSDF"; + fwrite($fout, "memory_replacement_policy " . $memory_replacement . "\n"); + if ($cache_replacement == "") $cache_replacement="heap GSDF"; + fwrite($fout, "cache_replacement_policy " . $cache_replacement . "\n"); + fwrite($fout, "\n"); + + if ($log_enabled == "on" ) { + fwrite($fout, "cache_access_log /var/log/squid/access.log\n"); + fwrite($fout, "cache_log /var/log/squid/cache.log\n"); + fwrite($fout, "cache_store_log none\n"); + } else { + fwrite($fout, "cache_access_log /dev/null\n"); + fwrite($fout, "cache_log /dev/null\n"); + fwrite($fout, "cache_store_log none\n"); + } + + if ($log_query_terms == "on") { + fwrite($fout, "strip_query_terms off\n"); + } else { + fwrite($fout, "strip_query_terms on\n"); + } + + if ($log_user_agents == "on") { + fwrite($fout, "useragent_log /var/log/squid/useragent.log\n"); + } + fwrite($fout, "\n"); + + fwrite($fout, "log_mime_hdrs off\n"); + fwrite($fout, "emulate_httpd_log on\n"); + if ($client_ip_forwarding !== "on") { + fwrite($fout, "forwarded_for off\n"); + } elseif ($user_forwarding !== "on") { + fwrite($fout, "forwarded_for off\n"); + } else { + fwrite($fout, "forwarded_for on\n"); + } + fwrite($fout, "\n"); + + fwrite($fout, "acl within_timeframe time MTWHFAS 00:00-24:00\n"); + fwrite($fout, "\n"); + + + $lactive_interface = strtolower($active_interface); + + $lancfg = $config['interfaces'][$lactive_interface]; + $lanif = $lancfg['if']; + $lanip = $lancfg['ipaddr']; + $lansa = gen_subnet($lancfg['ipaddr'], $lancfg['subnet']); + $lansn = $lancfg['subnet']; + + fwrite($fout, "acl all src " . $lansa . "/" . $lansn . "\n"); + fwrite($fout, "acl localnet src " . $lansa . "/" . $lansn . "\n"); + fwrite($fout, "acl localhost src 127.0.0.1/255.255.255.255\n"); + fwrite($fout, "acl SSL_ports port 443 563\n"); + fwrite($fout, "acl Safe_ports port 80 # http\n"); + fwrite($fout, "acl Safe_ports port 21 # ftp\n"); + fwrite($fout, "acl Safe_ports port 443 563 # https, snews\n"); + fwrite($fout, "acl Safe_ports port 70 # gopher\n"); + fwrite($fout, "acl Safe_ports port 210 # wais\n"); + fwrite($fout, "acl Safe_ports port 1025-65535 # unregistered ports\n"); + fwrite($fout, "acl Safe_ports port 280 # http-mgmt\n"); + fwrite($fout, "acl Safe_ports port 488 # gss-http\n"); + fwrite($fout, "acl Safe_ports port 591 # filemaker\n"); + fwrite($fout, "acl Safe_ports port 777 # multiling http\n"); + fwrite($fout, "acl Safe_ports port 800 # Squids port (for icons)\n"); + fwrite($fout, "\n"); + + fwrite($fout, "acl CONNECT method CONNECT\n"); + fwrite($fout, "\n"); + + fwrite($fout, "#access to squid; local machine; no restrictions\n"); + fwrite($fout, "http_access allow localnet\n"); + fwrite($fout, "http_access allow localhost\n"); + fwrite($fout, "\n"); + + fwrite($fout, "#Deny non web services\n"); + fwrite($fout, "http_access deny !Safe_ports\n"); + fwrite($fout, "http_access deny CONNECT\n"); + fwrite($fout, "\n"); + + fwrite($fout, "#Set custom configured ACLs\n"); + fwrite($fout, "http_access deny all\n"); + fwrite($fout, "\n"); + + fwrite($fout, "cache_effective_user squid\n"); + fwrite($fout, "cache_effective_group squid\n"); + fwrite($fout, "\n"); + + fwrite($fout, "#Strip HTTP Header\n"); + fwrite($fout, "header_access X-Forwarded-For deny all\n"); + fwrite($fout, "header_access deny all\n"); + fwrite($fout, "\n"); + + if ($urlfilter_enable == "on") { + fwrite($fout, "redirect_program /usr/sbin/squidGuard"); + fwrite($fout, "redirect_children 5"); + } + + if ($visible_hostname !== "") { + fwrite($fout, "visible_hostname " . $visible_hostname . "\n"); + } + + if ($cache_admin_email !== "") { + fwrite($fout, "cache_mgr " . $cache_admin_email . "\n"); + } + + if ($maximum_object_size == "") $maximum_object_size="4096"; + if ($minimum_object_size == "") $minimum_object_size="0"; + fwrite($fout, "maximum_object_size " . $maximum_object_size . " KB\n"); + fwrite($fout, "minimum_object_size " . $minimum_object_size . " KB\n"); + fwrite($fout, "\n"); + + if ($proxy_forwarding == "on") { + fwrite($fout, "cache_peer " . $upstream_proxy . "parent " . $upstream_proxy_port . "3130 login=" . upstream_username . ":" . upstream_password . " default no-query\n"); + fwrite($fout, "never_direct allow all\n"); + } + + if ($transparent_proxy == "on") { + fwrite($fout, "httpd_accel_host virtual\n"); + fwrite($fout, "httpd_accel_port 80\n"); + fwrite($fout, "httpd_accel_with_proxy on\n"); + fwrite($fout, "httpd_accel_uses_host_header on\n"); + fwrite($fout, "\n"); + } + fclose($fout); - } + } + - function sync_package_squid; - write_squid_config(); + function sync_package_squid () { mwexec("/usr/local/sbin/squid -k reconfigure"); conf_mount_ro(); config_unlock(); - } + } - sync_package_squid(); + global_write_squid_config(); + - function sync_package_squid; - write_squid_config(); + function sync_package_squid() { mwexec("/usr/local/sbin/squid -k reconfigure"); conf_mount_ro(); config_unlock(); } + global_write_squid_config(); sync_package_squid(); + + write_static_squid_config(); + + $fout = fopen("/usr/local/etc/rc.d/squid.sh","w"); + fwrite($fout, "#!/bin/sh\n"); + fwrite($fout, "# PACKAGE: Squid\n); + fwrite($fout, "# EXECUTABLE: squid\n\n"); + fwrite($fout "# Alert system that we need the / mount rw\n"); + fwrite($fout, "touch /tmp/rw_root_mount\n\n"); + fwrite($fout, "/usr/local/sbin/squid -D\n\n"); + fwrite($fout, "touch /tmp/filter_dirty\n\n"); + fclose($fout); + + chmod("/usr/local/etc/rc.d/squid.sh", 755); + update_output_window("Configuring Squid... This may take a moment..."); + mwexec("/usr/local/sbin/squid -z"); + update_output_window("Starting Squid..."); + mwexec_bg("/usr/local/etc/rc.d/squid.sh"); + filter_configure(); + + + + rmdir_recursive("/usr/local/squid"); + unlink_if_exists("/var/mail/squid"); + unlink_if_exists("/usr/local/etc/rc.d/squid"); + unlink_if_exists("/usr/local/etc/squid/squid.conf"); + unlink_if_exists("/usr/local/etc/squid"); + unlink_if_exists("/usr/local/libexec/squid"); + filter_configure(); + + + + + squid + \ No newline at end of file diff --git a/packages/squid_traffic.xml b/packages/squid_traffic.xml new file mode 100644 index 00000000..037752e2 --- /dev/null +++ b/packages/squid_traffic.xml @@ -0,0 +1,125 @@ + + + + + squidtraffic + + + + + + ['installedpackages']['package']['squidtraffic']['configuration']['settings'] + /pkg_edit.php?xml=squid_traffic.xml&id=0 + + + + General Settings + /pkg_edit.php?xml=squid_ng.xml&id=0 + + + + Upstream Proxy + /pkg_edit.php?xml=squid_upstream.xml&id=0 + + + + Cache Mgmt + /pkg_edit.php?xml=squid_cache.xml&id=0 + + + + Network Access Control + /pkg_edit.php?xml=squid_nac.xml&id=0 + + + + Traffic Mgmt + /pkg_edit.php?xml=squid_traffic.xml&id=0 + + + + + + + + + Maximum Download Size (KB) + max_download_size + This value allows limitation to download size (in KB) for each download request. The default value is 0, which disables the limitation. + input + 4 + + + + Maximum Upload Size (KB) + max_upload_size + This value allows limitation to upload size (in KB) for each upload request. The default value is 0, which disables the limitation. + input + 4 + + + + Download Throttle on Interface + dl_overall + This value specifies the bandwidth throttle on the interface if desired. + select + + + + + + + + + + + + + + + Download Limit Per Host + dl_per_host + This value specifies the download limit per host if desired. + select + + + + + + + + + + + + + + + Throttle Binary Files + throttle_binary_files + checkbox + + + + Throttle CD Images + throttle_cd_images + checkbox + + + + Throttle Multimedia + throttle_multimedia + checkbox + + + + \ No newline at end of file diff --git a/packages/squid_upstream.xml b/packages/squid_upstream.xml index 3d18924f..ab3eb008 100644 --- a/packages/squid_upstream.xml +++ b/packages/squid_upstream.xml @@ -2,18 +2,20 @@ - Squid Upstream Proxy + squidupstream - installedpackages->package->$packagename->configuration->settings + ['installedpackages']['package']['squidupstream']['configuration']['settings'] + /pkg_edit.php?xml=squid_upstream.xml&id=0 + General Settings - /pkg_edit.php?xml=squid1.xml&id=0 + /pkg_edit.php?xml=squid_ng.xml&id=0 @@ -24,7 +26,7 @@ Cache Mgmt - /pkg_edit.php?xml=squid_cache&.xmlamp;id=0 + /pkg_edit.php?xml=squid_cache.xml&id=0 @@ -37,7 +39,7 @@ /pkg_edit.php?xml=squid_traffic.xml&id=0 - + @@ -58,7 +61,7 @@ Client IP Address Forwarding - client_ip_forwardining + client_ip_forwarding This option will enable the client IP address to be forwarded to the upstream proxy server. checkbox @@ -102,4 +105,7 @@ + + + \ No newline at end of file -- cgit v1.2.3