Revision: 7491
http://sourceforge.net/p/ipcop/svn/7491
Author: owes
Date: 2014-04-21 14:39:09 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Do not try to redefine localhost.
Modified Paths:
--------------
ipcop/trunk/src/scripts/makesquidconf.pl
ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
Modified: ipcop/trunk/src/scripts/makesquidconf.pl
===================================================================
--- ipcop/trunk/src/scripts/makesquidconf.pl 2014-04-19 07:07:19 UTC (rev
7490)
+++ ipcop/trunk/src/scripts/makesquidconf.pl 2014-04-21 14:39:09 UTC (rev
7491)
@@ -633,9 +633,9 @@
print FILE "\n";
}
+ # localhost is predefined, does not need definition
print FILE <<END
acl manager url_regex -i ^cache_object:// /squid-internal-mgr/
-acl localhost src 127.0.0.0/32
END
;
open (PORTS,"$acl_ports_ssl");
@@ -715,8 +715,7 @@
$blue_net =
"$netsettings{'BLUE_1_NETADDRESS'}/$netsettings{'BLUE_1_NETMASK'}";
$blue_ip = "$netsettings{'BLUE_1_ADDRESS'}";
}
- if (!-z $acl_include)
- {
+ if (!-z $acl_include) {
open (ACL, "$acl_include");
print FILE "\n#Start of custom includes\n\n";
while (<ACL>) {
@@ -730,7 +729,10 @@
print FILE "\n#End of custom includes\n";
close (ACL);
}
- if ((!-z $extgrp) && ($proxysettings{'AUTH_METHOD'} eq 'ncsa') &&
($proxysettings{'NCSA_BYPASS_REDIR'} eq 'on')) { print FILE
"\nredirector_access deny for_extended_users\n"; }
+ if ((!-z $extgrp) && ($proxysettings{'AUTH_METHOD'} eq 'ncsa') &&
($proxysettings{'NCSA_BYPASS_REDIR'} eq 'on')) {
+ print FILE "\nredirector_access deny for_extended_users\n";
+ }
+
print FILE <<END
#Access to squid manager from localhost:
Modified: ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
===================================================================
--- ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-19 07:07:19 UTC
(rev 7490)
+++ ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-21 14:39:09 UTC
(rev 7491)
@@ -10,6 +10,7 @@
/home/httpd/cgi-bin/urlfilter.cgi
/usr/lib/ipcop/general-functions.pl
/usr/local/bin/makegraphs.pl
+/usr/local/bin/makesquidconf.pl
/usr/local/bin/upgrade.sh
/usr/local/sbin/setup
/usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
