Project

General

Profile

Feature #1100 » diff_squid.inc.diff

Yehuda Katz, 12/21/2010 01:27 AM

View differences:

squid.inc 2010-12-13 13:40:47.000000000 -0500
795 795
	global $config, $valid_acls;
796 796

  
797 797
  $port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128);
798
  $settings = $config['installedpackages']['squidnac']['config'][0];
798
  $settings = $config['installedpackages']['squid']['config'][0]; /* squidnac does not exist */
799 799
	$webgui_port = $config['system']['webgui']['port'];
800

  
800
	
801
	$addtl_ports = $settings['addtl_ports'];
802
	$addtl_sslports = $settings['addtl_sslports'];
803
	
801 804
	$conf = <<<EOD
802 805

  
803 806
# Setup some default acls
804 807
acl all src 0.0.0.0/0.0.0.0
805 808
acl localhost src 127.0.0.1/255.255.255.255
806
acl safeports port 21 70 80 210 280 443 488 563 591 631 777 901 $webgui_port $port 1025-65535
807
acl sslports port 443 563 $webgui_port
809
acl safeports port 21 70 80 210 280 443 488 563 591 631 777 901 $webgui_port $port 1025-65535 $addtl_ports
810
acl sslports port 443 563 $webgui_port $addtl_sslports
808 811
acl manager proto cache_object
809 812
acl purge method PURGE
810 813
acl connect method CONNECT
(3-3/5)