Revision: 6385
http://ipcop.svn.sourceforge.net/ipcop/?rev=6385&view=rev
Author: owes
Date: 2012-02-20 21:02:05 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
Readd a default squidGuard.conf with modification warnings. Add redirector
configfile for URL filter.
Modified Paths:
--------------
ipcop/trunk/config/cfgroot/squidGuard.conf
ipcop/trunk/html/cgi-bin/urlfilter.cgi
ipcop/trunk/lfs/ipcop
ipcop/trunk/lfs/squidGuard
Added Paths:
-----------
ipcop/trunk/config/cfgroot/redirector-urlfilter
Added: ipcop/trunk/config/cfgroot/redirector-urlfilter
===================================================================
--- ipcop/trunk/config/cfgroot/redirector-urlfilter
(rev 0)
+++ ipcop/trunk/config/cfgroot/redirector-urlfilter 2012-02-20 21:02:05 UTC
(rev 6385)
@@ -0,0 +1,4 @@
+ENABLED=off
+ORDER=10
+NAME=URL filter
+CMD=/usr/bin/squidGuard
Modified: ipcop/trunk/config/cfgroot/squidGuard.conf
===================================================================
--- ipcop/trunk/config/cfgroot/squidGuard.conf 2012-02-20 20:40:45 UTC (rev
6384)
+++ ipcop/trunk/config/cfgroot/squidGuard.conf 2012-02-20 21:02:05 UTC (rev
6385)
@@ -1,5 +1,10 @@
+# Do not modify '/var/ipcop/proxy/squidGuard.conf' directly since any changes
+# you make will be overwritten whenever you resave URL filter settings using
the
+# web interface!
+
logdir /var/log/squidGuard
-dbhome /var/ipcop/proxy/blacklists
+syslog enable
+dbhome /var/lib/squidguard/db
acl {
default {
Modified: ipcop/trunk/html/cgi-bin/urlfilter.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-20 20:40:45 UTC (rev
6384)
+++ ipcop/trunk/html/cgi-bin/urlfilter.cgi 2012-02-20 21:02:05 UTC (rev
6385)
@@ -3014,10 +3014,17 @@
open(FILE, ">/var/ipcop/proxy/squidGuard.conf") or die "Unable to write
squidGuard.conf file";
flock(FILE, 2);
- print FILE "logdir /var/log/squidGuard\n";
- print FILE "syslog enable\n";
- print FILE "dbhome $dbdir\n\n";
+ print FILE <<END
+# Do not modify '/var/ipcop/proxy/squidGuard.conf' directly since any changes
+# you make will be overwritten whenever you resave URL filter settings using
the
+# web interface!
+logdir /var/log/squidGuard
+syslog enable
+dbhome $dbdir
+
+END
+ ;
if ($filtersettings{'ENABLE_SAFESEARCH'} eq 'on') {
print FILE "rewrite rew-rule-1 {\n";
print FILE " # rewrite safesearch\n";
Modified: ipcop/trunk/lfs/ipcop
===================================================================
--- ipcop/trunk/lfs/ipcop 2012-02-20 20:40:45 UTC (rev 6384)
+++ ipcop/trunk/lfs/ipcop 2012-02-20 21:02:05 UTC (rev 6385)
@@ -112,6 +112,7 @@
cp $(DIR_SRC)/config/cfgroot/scheduler
$(CONFIG_ROOT)/main/scheduler
cp $(DIR_SRC)/config/cfgroot/blacklistupdate.urls
$(CONFIG_ROOT)/proxy/blacklistupdate/blacklistupdate.urls
cp $(DIR_SRC)/config/cfgroot/squidGuard.conf
$(CONFIG_ROOT)/proxy/squidGuard.conf
+ cp $(DIR_SRC)/config/cfgroot/redirector-urlfilter
$(CONFIG_ROOT)/proxy/redirector/urlfilter
cp $(DIR_SRC)/config/cfgroot/ntp.conf
$(CONFIG_ROOT)/time/ntp.conf
cp $(DIR_SRC)/config/cfgroot/time-settings
$(CONFIG_ROOT)/time/settings
cp $(DIR_SRC)/config/cfgroot/useragents
$(CONFIG_ROOT)/proxy/
Modified: ipcop/trunk/lfs/squidGuard
===================================================================
--- ipcop/trunk/lfs/squidGuard 2012-02-20 20:40:45 UTC (rev 6384)
+++ ipcop/trunk/lfs/squidGuard 2012-02-20 21:02:05 UTC (rev 6385)
@@ -98,11 +98,6 @@
endif
cd $(DIR_APP) && make install
- # while developing urlfilter, deliver an empty squidGuard.conf
- rm /var/ipcop/proxy/squidGuard.conf
- touch /var/ipcop/proxy/squidGuard.conf
- chown nobody:nobody /var/ipcop/proxy/squidGuard.conf
-
# Database directory
chown nobody:nobody /var/lib/squidguard/db
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
