$Lang::tr{'advproxy admin mail'}: 
- |
+ |
END
@@ -969,8 +989,13 @@ my $count = `arp -a | wc -l`;
if ( $count < 1 ){$count = 1;}
if ( -e "/usr/bin/squidclamav" ) {
print "".$Lang::tr{'advproxy squidclamav'}."
";
- print $Lang::tr{'advproxy enabled'}."
";
- print "+ ".int(( $count**(1/3)) * 8);
+ if ( ! -e "/var/run/clamav/clamd.pid" ){
+ print "clamav not running
";
+ $proxysettings{'ENABLE_CLAMAV'} = 'off';
+ }
+ else {
+ print $Lang::tr{'advproxy enabled'}."
";
+ print "+ ".int(( $count**(1/3)) * 8);}
print " | ";
} else {
print " | ";
@@ -1038,6 +1063,18 @@ print <
$Lang::tr{'advproxy cache management'} |
+
+ | $Lang::tr{'proxy cachemgr'}: |
+ |
+ $Lang::tr{'advproxy admin mail'}: |
+ |
+
+
+ | $Lang::tr{'proxy filedescriptors'}: |
+ |
+ $Lang::tr{'proxy admin password'}: |
+ |
+
| | | |
@@ -1162,10 +1199,10 @@ END
if (!$proxysettings{'SRC_SUBNETS'})
{
- print "$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}\n";
+ print "$green_cidr\n";
if ($netsettings{'BLUE_DEV'})
{
- print "$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}\n";
+ print "$blue_cidr\n";
}
} else { print $proxysettings{'SRC_SUBNETS'}; }
@@ -1754,9 +1791,9 @@ print <
|
|
+ |
|
|
|
@@ -2543,6 +2581,7 @@ sub check_acls
}
@temp = split(/\n/,$proxysettings{'DST_NOAUTH'});
+ undef $proxysettings{'DST_NOAUTH'};
foreach (@temp)
{
s/^\s+//g;
@@ -2659,10 +2698,10 @@ sub write_acls
flock(FILE, 2);
if (!$proxysettings{'SRC_SUBNETS'})
{
- print FILE "$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}\n";
+ print FILE "$green_cidr\n";
if ($netsettings{'BLUE_DEV'})
{
- print FILE "$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}\n";
+ print FILE "$blue_cidr\n";
}
} else { print FILE $proxysettings{'SRC_SUBNETS'}; }
close(FILE);
@@ -3015,7 +3054,7 @@ END
print FILE "cache deny no_cache_domains\n";
}
if (!-z $acl_dst_nocache_net) {
- print FILE "acl no_cache_domains dst \"$acl_dst_nocache_net\"\n";
+ print FILE "acl no_cache_ipaddr dst \"$acl_dst_nocache_net\"\n";
print FILE "cache deny no_cache_ipaddr\n";
}
if (!-z $acl_dst_nocache_url) {
@@ -3031,7 +3070,6 @@ cache_effective_group squid
umask 022
pid_filename /var/run/squid.pid
-max_filedescriptors 4096
cache_mem $proxysettings{'CACHE_MEM'} MB
END
@@ -3287,8 +3325,8 @@ END
}
print FILE <) {
$_ =~ s/__GREEN_IP__/$netsettings{'GREEN_ADDRESS'}/;
- $_ =~ s/__GREEN_NET__/$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}/;
+ $_ =~ s/__GREEN_NET__/$green_cidr/;
$_ =~ s/__BLUE_IP__/$blue_ip/;
$_ =~ s/__BLUE_NET__/$blue_net/;
$_ =~ s/__PROXY_PORT__/$proxysettings{'PROXY_PORT'}/;
@@ -3779,19 +3817,23 @@ END
if ($proxysettings{'FORWARD_IPADDRESS'} eq 'off')
{
- print FILE "header_access X-Forwarded-For deny all\n";
+ print FILE "request_header_access X-Forwarded-For deny all\n";
+ print FILE "reply_header_access X-Forwarded-For deny all\n";
}
if ($proxysettings{'FORWARD_VIA'} eq 'off')
{
- print FILE "header_access Via deny all\n";
+ print FILE "request_header_access Via deny all\n";
+ print FILE "reply_header_access Via deny all\n";
}
if (!($proxysettings{'FAKE_USERAGENT'} eq ''))
{
- print FILE "header_access User-Agent deny all\n";
+ print FILE "request_header_access User-Agent deny all\n";
+ print FILE "reply_header_access User-Agent deny all\n";
}
if (!($proxysettings{'FAKE_REFERER'} eq ''))
{
- print FILE "header_access Referer deny all\n";
+ print FILE "request_header_access Referer deny all\n";
+ print FILE "reply_header_access Referer deny all\n";
}
print FILE "\n";
@@ -3839,14 +3881,18 @@ END
;
$replybodymaxsize = 1024 * $proxysettings{'MAX_INCOMING_SIZE'};
if ($proxysettings{'MAX_INCOMING_SIZE'} > 0) {
- if (!-z $acl_src_unrestricted_ip) { print FILE "reply_body_max_size 0 allow IPFire_unrestricted_ips\n"; }
- if (!-z $acl_src_unrestricted_mac) { print FILE "reply_body_max_size 0 allow IPFire_unrestricted_mac\n"; }
+ if (!-z $acl_src_unrestricted_ip) { print FILE "reply_body_max_size 0 deny IPFire_unrestricted_ips\n"; }
+ if (!-z $acl_src_unrestricted_mac) { print FILE "reply_body_max_size 0 deny IPFire_unrestricted_mac\n"; }
if ($proxysettings{'AUTH_METHOD'} eq 'ncsa')
{
- if (!-z $extgrp) { print FILE "reply_body_max_size 0 allow for_extended_users\n"; }
+ if (!-z $extgrp) { print FILE "reply_body_max_size 0 deny for_extended_users\n"; }
}
}
- print FILE "reply_body_max_size $replybodymaxsize allow all\n\n";
+
+ if ( $replybodymaxsize != '0' )
+ {
+ print FILE "reply_body_max_size $replybodymaxsize deny all\n\n";
+ }
print FILE "visible_hostname";
if ($proxysettings{'VISIBLE_HOSTNAME'} eq '')
@@ -3856,7 +3902,11 @@ END
print FILE " $proxysettings{'VISIBLE_HOSTNAME'}\n\n";
}
- if (!($proxysettings{'ADMIN_MAIL_ADDRESS'} eq '')) { print FILE "cache_mgr $proxysettings{'ADMIN_MAIL_ADDRESS'}\n\n"; }
+ if (!($proxysettings{'ADMIN_MAIL_ADDRESS'} eq '')) { print FILE "cache_mgr $proxysettings{'ADMIN_MAIL_ADDRESS'}\n"; }
+ if (!($proxysettings{'ADMIN_PASSWORD'} eq '')) { print FILE "cachemgr_passwd $proxysettings{'ADMIN_PASSWORD'} all\n"; }
+ print FILE "\n";
+
+ print FILE "max_filedescriptors $proxysettings{'FILEDESCRIPTORS'}\n\n";
# Write the parent proxy info, if needed.
if ($remotehost ne '')
@@ -3954,3 +4004,15 @@ sub deluser
}
# -------------------------------------------------------------------
+
+sub writecachemgr
+{
+ open(FILE, ">${General::swroot}/proxy/cachemgr.conf");
+ flock(FILE, 2);
+ print FILE "$netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}\n";
+ print FILE "localhost";
+ close(FILE);
+ return;
+}
+
+# -------------------------------------------------------------------