diff options
Diffstat (limited to 'config/squid3')
| -rw-r--r-- | config/squid3/proxy_monitor.sh | 8 | ||||
| -rw-r--r-- | config/squid3/squid.inc | 13 | ||||
| -rw-r--r-- | config/squid3/squid.xml | 5 |
3 files changed, 8 insertions, 18 deletions
diff --git a/config/squid3/proxy_monitor.sh b/config/squid3/proxy_monitor.sh index fab2ee54..fa5a87bb 100644 --- a/config/squid3/proxy_monitor.sh +++ b/config/squid3/proxy_monitor.sh @@ -41,7 +41,7 @@ sleep 5 # Squid monitor 1.2 while [ /bin/true ]; do if [ ! -f /var/run/squid_alarm ]; then - NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'` + NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'` if [ $NUM_PROCS -lt 1 ]; then # squid is down echo "Squid has exited. Reconfiguring filter." | \ @@ -50,16 +50,16 @@ while [ /bin/true ]; do /usr/local/etc/rc.d/squid.sh start sleep 3 echo "Reconfiguring filter..." | logger -p daemon.info -i -t Squid_Alarm - /etc/rc.filter_configure_sync + /etc/rc.filter_configure touch /var/run/squid_alarm fi fi - NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'` + NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'` if [ $NUM_PROCS -gt 0 ]; then if [ -f /var/run/squid_alarm ]; then echo "Squid has resumed. Reconfiguring filter." | \ logger -p daemon.info -i -t Squid_Alarm - /etc/rc.filter_configure_sync + /etc/rc.filter_configure rm /var/run/squid_alarm fi fi diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc index 417eaeae..784fea8f 100644 --- a/config/squid3/squid.inc +++ b/config/squid3/squid.inc @@ -286,7 +286,7 @@ function squid_deinstall_command() { 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"); update_status("Reloading filter..."); - filter_configure_sync(); + filter_configure(); } function squid_before_form_general($pkg) { @@ -344,17 +344,6 @@ function squid_validate_general($post, $input_errors) { $input_errors[] = "You can not run squid on the same port as the webgui"; } - if (($post['transparent_proxy'] != 'on') && ($post['private_subnet_proxy_off'] == 'on')) { - $input_errors[] = "You can not bypass traffic to private subnets without using the transparent proxy."; - } - - 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); diff --git a/config/squid3/squid.xml b/config/squid3/squid.xml index 414ac0ff..f82cf81a 100644 --- a/config/squid3/squid.xml +++ b/config/squid3/squid.xml @@ -166,6 +166,7 @@ <fieldname>transparent_proxy</fieldname> <description>If transparent mode is enabled, all requests for destination port 80 will be forwarded to the proxy server without any additional configuration necessary.</description> <type>checkbox</type> + <enablefields>private_subnet_proxy_off,defined_ip_proxy_off,defined_ip_proxy_off_dest</enablefields> <required/> </field> <field> @@ -177,14 +178,14 @@ <field> <fielddescr>Bypass proxy for these source IPs</fielddescr> <fieldname>defined_ip_proxy_off</fieldname> - <description>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 (;).</description> + <description>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 (;). [Applies only to transparent mode]</description> <type>input</type> <size>80</size> </field> <field> <fielddescr>Bypass proxy for these destination IPs</fielddescr> <fieldname>defined_ip_proxy_off_dest</fieldname> - <description>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 (;).</description> + <description>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 (;). [Applies only to transparent mode]</description> <type>input</type> <size>80</size> </field> |