Revision: 7166
http://sourceforge.net/p/ipcop/svn/7166
Author: dotzball
Date: 2013-11-23 19:52:20 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
Write squid.conf in Squid 3.3 format.
Modified Paths:
--------------
ipcop/trunk/src/scripts/makesquidconf.pl
ipcop/trunk/src/scripts/upgrade.sh
Modified: ipcop/trunk/src/scripts/makesquidconf.pl
===================================================================
--- ipcop/trunk/src/scripts/makesquidconf.pl 2013-11-23 13:50:19 UTC (rev
7165)
+++ ipcop/trunk/src/scripts/makesquidconf.pl 2013-11-23 19:52:20 UTC (rev
7166)
@@ -405,17 +405,17 @@
if ($proxysettings{'LOGGING'} eq 'on')
{
print FILE <<END
-access_log /var/log/squid/access.log
+access_log stdio:/var/log/squid/access.log
cache_log /var/log/squid/cache.log
cache_store_log none
END
;
- if ($proxysettings{'LOGUSERAGENT'} eq 'on') { print FILE
"useragent_log \/var\/log\/squid\/user_agent.log\n"; }
+ if ($proxysettings{'LOGUSERAGENT'} eq 'on') { print FILE "access_log
stdio:\/var\/log\/squid\/user_agent.log useragent\n"; }
if ($proxysettings{'LOGQUERY'} eq 'on') { print FILE
"\nstrip_query_terms off\n"; }
} else {
print FILE <<END
-access_log /dev/null
-cache_log /dev/null
+access_log stdio:/dev/null
+cache_log stdio:/dev/null
cache_store_log none
END
;}
@@ -444,7 +444,7 @@
{
if ($proxysettings{'AUTH_METHOD'} eq 'ncsa')
{
- print FILE "auth_param basic program $authdir/ncsa_auth $userdb\n";
+ print FILE "auth_param basic program $authdir/basic_ncsa_auth
$userdb\n";
print FILE "auth_param basic children
$proxysettings{'AUTH_CHILDREN'}\n";
print FILE "auth_param basic realm $authrealm\n";
print FILE "auth_param basic credentialsttl
$proxysettings{'AUTH_CACHE_TTL'} minutes\n";
@@ -453,7 +453,7 @@
if ($proxysettings{'AUTH_METHOD'} eq 'ldap')
{
- print FILE "auth_param basic program $authdir/squid_ldap_auth -b
\"$proxysettings{'LDAP_BASEDN'}\"";
+ print FILE "auth_param basic program $authdir/basic_ldap_auth -b
\"$proxysettings{'LDAP_BASEDN'}\"";
if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D
\"$proxysettings{'LDAP_BINDDN_USER'}\""; }
if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w
$proxysettings{'LDAP_BINDDN_PASS'}"; }
if ($proxysettings{'LDAP_TYPE'} eq 'ADS')
@@ -530,7 +530,7 @@
if ($proxysettings{'AUTH_METHOD'} eq 'radius')
{
- print FILE "auth_param basic program $authdir/squid_radius_auth -h
$proxysettings{'RADIUS_SERVER'} -p $proxysettings{'RADIUS_PORT'} ";
+ print FILE "auth_param basic program $authdir/basic_radius_auth -h
$proxysettings{'RADIUS_SERVER'} -p $proxysettings{'RADIUS_PORT'} ";
if (!($proxysettings{'RADIUS_IDENTIFIER'} eq '')) { print FILE "-i
$proxysettings{'RADIUS_IDENTIFIER'} "; }
print FILE "-w $proxysettings{'RADIUS_SECRET'}\n";
print FILE "auth_param basic children
$proxysettings{'AUTH_CHILDREN'}\n";
@@ -629,7 +629,7 @@
}
print FILE <<END
-acl localhost src 127.0.0.1/32
+acl localhost src 127.0.0.0/32
END
;
open (PORTS,"$acl_ports_ssl");
@@ -1255,7 +1255,7 @@
if ($proxysettings{'ENABLE_REDIRECTOR'} eq 'on' && &activeredirectors > 0)
{
print FILE "url_rewrite_program $redirectwrapper\n";
- print FILE "url_rewrite_children $proxysettings{'CHILDREN'}\n\n";
+ print FILE "url_rewrite_children $proxysettings{'CHILDREN'} startup=1
idle=1 concurrency=0\n\n";
}
close FILE;
Modified: ipcop/trunk/src/scripts/upgrade.sh
===================================================================
--- ipcop/trunk/src/scripts/upgrade.sh 2013-11-23 13:50:19 UTC (rev 7165)
+++ ipcop/trunk/src/scripts/upgrade.sh 2013-11-23 19:52:20 UTC (rev 7166)
@@ -105,3 +105,7 @@
# Fix permissions of urlfilter files if necessary
/usr/local/bin/blacklistupdate.pl --perm
+
+# write new squid.conf (format changed with squid 3.3.x in 2.1.1
+/usr/local/bin/makesquidconf.pl
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing
conversations that shape the rapidly evolving mobile landscape. Sign up now.
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
