This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 8fbcf730aee1210abd399ecab5f68dbc9c01bad2 (commit) from 94b3d7d2f298d0d52a622210529cd4901060cd25 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 8fbcf730aee1210abd399ecab5f68dbc9c01bad2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Aug 28 17:01:44 2014 +0200
proxy.cgi: Move ACL definitions up
ACl definitions could not be used in some other directives unless they are defined earlier.
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/proxy.cgi | 84 +++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 42 deletions(-)
Difference in files: diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 772852b..ba2455a 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3221,6 +3221,48 @@ END print FILE "\n"; }
+ open (PORTS,"$acl_ports_ssl"); + my @ssl_ports = <PORTS>; + close PORTS; + + if (@ssl_ports) { + foreach (@ssl_ports) { + print FILE "acl SSL_ports port $_"; + } + } + + open (PORTS,"$acl_ports_safe"); + my @safe_ports = <PORTS>; + close PORTS; + + if (@safe_ports) { + foreach (@safe_ports) { + print FILE "acl Safe_ports port $_"; + } + } + + print FILE <<END + +acl IPFire_http port $http_port +acl IPFire_https port $https_port +acl IPFire_ips dst $netsettings{'GREEN_ADDRESS'} +acl IPFire_networks src "$acl_src_subnets" +acl IPFire_servers dst "$acl_src_subnets" +acl IPFire_green_network src $green_cidr +acl IPFire_green_servers dst $green_cidr +END + ; + if ($netsettings{'BLUE_DEV'}) { print FILE "acl IPFire_blue_network src $blue_cidr\n"; } + if ($netsettings{'BLUE_DEV'}) { print FILE "acl IPFire_blue_servers dst $blue_cidr\n"; } + if (!-z $acl_src_banned_ip) { print FILE "acl IPFire_banned_ips src "$acl_src_banned_ip"\n"; } + if (!-z $acl_src_banned_mac) { print FILE "acl IPFire_banned_mac arp "$acl_src_banned_mac"\n"; } + if (!-z $acl_src_unrestricted_ip) { print FILE "acl IPFire_unrestricted_ips src "$acl_src_unrestricted_ip"\n"; } + if (!-z $acl_src_unrestricted_mac) { print FILE "acl IPFire_unrestricted_mac arp "$acl_src_unrestricted_mac"\n"; } + print FILE <<END +acl CONNECT method CONNECT +END + ; + if ($proxysettings{'CACHE_SIZE'} > 0) { print FILE <<END maximum_object_size $proxysettings{'MAX_SIZE'} KB @@ -3502,48 +3544,6 @@ END print FILE "acl blocked_mimetypes rep_mime_type "$mimetypes"\n\n"; }
-open (PORTS,"$acl_ports_ssl"); -my @ssl_ports = <PORTS>; -close PORTS; - -if (@ssl_ports) { - foreach (@ssl_ports) { - print FILE "acl SSL_ports port $_"; - } -} - -open (PORTS,"$acl_ports_safe"); -my @safe_ports = <PORTS>; -close PORTS; - -if (@safe_ports) { - foreach (@safe_ports) { - print FILE "acl Safe_ports port $_"; - } -} - - print FILE <<END - -acl IPFire_http port $http_port -acl IPFire_https port $https_port -acl IPFire_ips dst $netsettings{'GREEN_ADDRESS'} -acl IPFire_networks src "$acl_src_subnets" -acl IPFire_servers dst "$acl_src_subnets" -acl IPFire_green_network src $green_cidr -acl IPFire_green_servers dst $green_cidr -END - ; - if ($netsettings{'BLUE_DEV'}) { print FILE "acl IPFire_blue_network src $blue_cidr\n"; } - if ($netsettings{'BLUE_DEV'}) { print FILE "acl IPFire_blue_servers dst $blue_cidr\n"; } - if (!-z $acl_src_banned_ip) { print FILE "acl IPFire_banned_ips src "$acl_src_banned_ip"\n"; } - if (!-z $acl_src_banned_mac) { print FILE "acl IPFire_banned_mac arp "$acl_src_banned_mac"\n"; } - if (!-z $acl_src_unrestricted_ip) { print FILE "acl IPFire_unrestricted_ips src "$acl_src_unrestricted_ip"\n"; } - if (!-z $acl_src_unrestricted_mac) { print FILE "acl IPFire_unrestricted_mac arp "$acl_src_unrestricted_mac"\n"; } - print FILE <<END -acl CONNECT method CONNECT -END - ; - if ($proxysettings{'CLASSROOM_EXT'} eq 'on') { print FILE <<END
hooks/post-receive -- IPFire 2.x development tree