Revision: 7768
http://sourceforge.net/p/ipcop/svn/7768
Author: owes
Date: 2015-01-04 10:05:56 +0000 (Sun, 04 Jan 2015)
Log Message:
-----------
Identify lines beginning with # as comment lines in ports / SSL-ports
Modified Paths:
--------------
ipcop/trunk/src/scripts/makesquidconf.pl
ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8
Modified: ipcop/trunk/src/scripts/makesquidconf.pl
===================================================================
--- ipcop/trunk/src/scripts/makesquidconf.pl 2015-01-04 10:02:51 UTC (rev
7767)
+++ ipcop/trunk/src/scripts/makesquidconf.pl 2015-01-04 10:05:56 UTC (rev
7768)
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
-# Copyright (C) 2009-2014, the IPCop team.
+# Copyright (C) 2009-2015, the IPCop team.
#
# $Id$
#
@@ -623,21 +623,33 @@
acl manager url_regex -i ^cache_object:// /squid-internal-mgr/
acl localhost src 127.0.0.1/32
END
-;
-open (PORTS,"$acl_ports_ssl");
-@temp = <PORTS>;
-close PORTS;
-if (@temp)
-{
- foreach (@temp) { print FILE "acl SSL_ports port $_"; }
-}
-open (PORTS,"$acl_ports_safe");
-@temp = <PORTS>;
-close PORTS;
-if (@temp)
-{
- foreach (@temp) { print FILE "acl Safe_ports port $_"; }
-}
+ ;
+ open(PORTS,"$acl_ports_ssl");
+ @temp = <PORTS>;
+ close PORTS;
+ if (@temp) {
+ foreach (@temp) {
+ if (substr($_, 0, 1) eq '#') {
+ print FILE "$_";
+ }
+ else {
+ print FILE "acl SSL_ports port $_";
+ }
+ }
+ }
+ open(PORTS,"$acl_ports_safe");
+ @temp = <PORTS>;
+ close PORTS;
+ if (@temp) {
+ foreach (@temp) {
+ if (substr($_, 0, 1) eq '#') {
+ print FILE "$_";
+ }
+ else {
+ print FILE "acl Safe_ports port $_";
+ }
+ }
+ }
print FILE <<END
acl IPCop_http port $http_port
Modified: ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8
===================================================================
--- ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8 2015-01-04 10:02:51 UTC
(rev 7767)
+++ ipcop/trunk/updates/2.1.8/ROOTFILES.i486-2.1.8 2015-01-04 10:05:56 UTC
(rev 7768)
@@ -4,6 +4,7 @@
/home/httpd/cgi-bin/updates.cgi
/home/httpd/cgi-bin/urlfilter.cgi
/usr/lib/ipcop/header.pl
+/usr/local/bin/makesquidconf.pl
/usr/local/bin/upgrade.sh
/usr/local/sbin/setup
##
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
