/[smecontribs]/rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-transparent_squid.patch
ViewVC logotype

Contents of /rpms/smeserver-coova-chilli/contribs7/smeserver-coova-chilli-0.2-transparent_squid.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Tue Jul 20 13:43:28 2010 UTC (14 years, 4 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-coova-chilli-0_2-20_el4_sme, smeserver-coova-chilli-0_2-17_el4_sme, smeserver-coova-chilli-0_2-18_el4_sme, smeserver-coova-chilli-0_2-19_el4_sme, HEAD 
* Mon Jul 19 2010 Daniel B. <daniel@firewall-services.com> 0.2-17
- Fixes sudo env (bug only in SME8)
- Uses TCPPort squid key instead of TransparentPort so coova can
  work with dansguardian
- insert NAT rule just before the ACCEPT (PREROUTING_FROM_CHILLI)
- add transparent directive to squid (required for squid => 2.6)
1 --- smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/squid/squid.conf/15HTTPPortChilli.transparent_squid 2010-07-20 15:19:12.000000000 +0200
2 +++ smeserver-coova-chilli-0.2/root/etc/e-smith/templates/etc/squid/squid.conf/15HTTPPortChilli 2010-07-20 15:21:31.000000000 +0200
3 @@ -4,9 +4,15 @@
4 $net = NetAddr::IP->new($net) + 1;
5 my $chillip = $net->addr;
6
7 +my $transparent = ' transparent';
8 +my $squid = `rpm -q --qf %{VERSION} squid`;
9 +
10 +$transparent = '' if ($squid =~ /^2\.5/);
11 +
12 $OUT ='';
13 if ($chilli{'status'} eq 'enabled'){
14 my $squidport = $squid{'TCPPort'} || '3128';
15 - $OUT = "http_port $chillip:$squidport\n";
16 + $OUT = "http_port $chillip:$squidport$transparent\n";
17 }
18 }
19 +
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed