Revision: 6379
http://ipcop.svn.sourceforge.net/ipcop/?rev=6379&view=rev
Author: owes
Date: 2012-02-19 20:47:52 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
Relocate blacklist database to /var/lib/squidguard
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/squidGuard
ipcop/trunk/html/cgi-bin/urlfilter.cgi
ipcop/trunk/src/scripts/blacklistupdate.pl
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
Modified: ipcop/trunk/config/rootfiles/common/squidGuard
===================================================================
--- ipcop/trunk/config/rootfiles/common/squidGuard 2012-02-19 20:41:49 UTC
(rev 6378)
+++ ipcop/trunk/config/rootfiles/common/squidGuard 2012-02-19 20:47:52 UTC
(rev 6379)
@@ -1,4 +1,6 @@
usr/bin/squidGuard
#usr/squidGuard
#var/ipcop/proxy/squidGuard.conf
+var/lib/squidguard
+var/lib/squidguard/db
var/log/squidGuard
Modified: ipcop/trunk/html/cgi-bin/urlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-19 20:41:49 UTC (rev
6378)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-19 20:47:52 UTC (rev
6379)
@@ -64,13 +64,13 @@
my $changed = 'no';
my $tcfile = "/var/ipcop/proxy/timeconst";
my $uqfile = "/var/ipcop/proxy/userquota";
-my $dbdir = "/var/ipcop/proxy/blacklists";
+my $dbdir = "/var/lib/squidguard/db";
my $editdir = "/var/ipcop/proxy/editor";
my $hintcolour = '#FFFFCC';
my $sourceurlfile = "/var/ipcop/proxy/blacklistupdate/blacklistupdate.urls";
my $updconffile = "/var/ipcop/proxy/blacklistupdate/blacklistupdate.conf";
-my $updflagfile = "/var/ipcop/proxy/blacklists/.blacklistupdate.last";
+my $updflagfile = "/var/lib/squidguard/.blacklistupdate.last";
my $errormessage = '';
my $updatemessage = '';
@@ -1501,7 +1501,7 @@
<tr>
<td class='base'>$Lang::tr{'block ads with empty window'}:</td>
<td><input type='checkbox' name='ENABLE_EMPTY_ADS'
$checked{'ENABLE_EMPTY_ADS'}{'on'} /></td>
- <td class='base'>$Lang::tr{'split log by category'}:</td>
+ <td class='base'>$Lang::tr{'split log by categories'}:</td>
<td><input type='checkbox' name='ENABLE_CATEGORY_LOG'
$checked{'ENABLE_CATEGORY_LOG'}{'on'} /></td>
</tr>
<tr>
Modified: ipcop/trunk/src/scripts/blacklistupdate.pl
===================================================================
--- ipcop/trunk/src/scripts/blacklistupdate.pl 2012-02-19 20:41:49 UTC (rev
6378)
+++ ipcop/trunk/src/scripts/blacklistupdate.pl 2012-02-19 20:47:52 UTC (rev
6379)
@@ -34,7 +34,7 @@
my $target = "/var/ipcop/proxy/download";
my $tempdb = "$target/blacklists";
-my $dbdir = "/var/ipcop/proxy/blacklists";
+my $dbdir = "/var/lib/squidguard/db";
my $sourceurlfile = "/var/ipcop/proxy/blacklistupdate/blacklistupdate.urls";
my $updconffile = "/var/ipcop/proxy/blacklistupdate/blacklistupdate.conf";
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-02-19 20:41:49 UTC
(rev 6378)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-02-19 20:47:52 UTC
(rev 6379)
@@ -9,6 +9,7 @@
/home/httpd/cgi-bin/shaping.cgi
/home/httpd/cgi-bin/time.cgi
/home/httpd/cgi-bin/urlfilter.cgi
+/usr/local/bin/blacklistupdate.pl
/usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
/usr/share/locale/bg_BG/LC_MESSAGES/ipcop.mo
/usr/share/locale/ca_ES/LC_MESSAGES/ipcop.mo
@@ -87,3 +88,6 @@
/usr/sbin/useradd
/usr/sbin/userdel
/usr/sbin/usermod
+##
+## modified squidGuard
+/usr/bin/squidGuard
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
