Revision: 7495
http://sourceforge.net/p/ipcop/svn/7495
Author: owes
Date: 2014-04-22 15:21:40 +0000 (Tue, 22 Apr 2014)
Log Message:
-----------
Blacklist update after RED connect only when the URL filter is enabled.
Modified Paths:
--------------
ipcop/trunk/src/scripts/blacklistupdate.pl
ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5
Modified: ipcop/trunk/src/scripts/blacklistupdate.pl
===================================================================
--- ipcop/trunk/src/scripts/blacklistupdate.pl 2014-04-22 15:18:27 UTC (rev
7494)
+++ ipcop/trunk/src/scripts/blacklistupdate.pl 2014-04-22 15:21:40 UTC (rev
7495)
@@ -16,7 +16,7 @@
# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
# (c) 2004-2007 marco.s - http://www.urlfilter.net
-# (c) 2012 The IPCop Team
+# (c) 2012-2014 The IPCop Team
#
# $Id$
#
@@ -33,13 +33,14 @@
my $make_clean = 1;
-my $target = "/var/ipcop/proxy/download";
-my $dbdir = "/var/lib/squidguard/db";
+my $target = '/var/ipcop/proxy/download';
+my $dbdir = '/var/lib/squidguard/db';
-my $sourceurlfile = "/var/ipcop/proxy/blacklistupdate/blacklistupdate.urls";
-my $updconffile = "/var/ipcop/proxy/blacklistupdate/blacklistupdate.conf";
+my $sourceurlfile = '/var/ipcop/proxy/blacklistupdate/blacklistupdate.urls';
+my $updconffile = '/var/ipcop/proxy/blacklistupdate/blacklistupdate.conf';
my %updatesettings;
+$updatesettings{'ENABLED'} = 'off';
$updatesettings{'ENABLE_AUTOUPDATE'} = 'off';
$updatesettings{'CHECKUPDATES'} = 'off';
@@ -65,8 +66,8 @@
$doUpdateForce = 1;
}
elsif ($argument eq '--red') {
- # check for update after red connect
- if($updatesettings{'CHECKUPDATES'} eq 'on') {
+ # check for update after red connect when URL filter enabled
+ if (($updatesettings{'ENABLED'} eq 'on') &&
($updatesettings{'CHECKUPDATES'} eq 'on')) {
$doUpdate = 1;
}
}
@@ -89,12 +90,12 @@
if ($doUpdate || $doUpdateForce) {
- if ($debugLevel > 0) {
- print "Updating...\n";
- system("logger -t installpackage[urlfilter] \"URL filter blacklist -
Updating...\"");
- }
if (-e '/var/ipcop/red/active') {
+ if ($debugLevel > 0) {
+ print "Updating...\n";
+ system("logger -t installpackage[urlfilter] \"URL filter blacklist
- Updating...\"");
+ }
&updateblacklist();
}
else {
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-22 15:18:27 UTC
(rev 7494)
+++ ipcop/trunk/updates/2.1.5/ROOTFILES.i486-2.1.5 2014-04-22 15:21:40 UTC
(rev 7495)
@@ -9,6 +9,7 @@
/home/httpd/cgi-bin/upload.cgi
/home/httpd/cgi-bin/urlfilter.cgi
/usr/lib/ipcop/general-functions.pl
+/usr/local/bin/blacklistupdate.pl
/usr/local/bin/makegraphs.pl
/usr/local/bin/makesquidconf.pl
/usr/local/bin/upgrade.sh
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
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
