Revision: 6437
http://ipcop.svn.sourceforge.net/ipcop/?rev=6437&view=rev
Author: dotzball
Date: 2012-02-29 17:46:59 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Handle squidGuard (urlfilter) default files (custom blacklists) in lfs/ipcop.
Those
files are included in the IPCop backup now.
Modified Paths:
--------------
ipcop/trunk/config/cfgroot/backup-include
ipcop/trunk/config/rootfiles/common/ipcop
ipcop/trunk/lfs/ipcop
ipcop/trunk/updates/2.1.0/setup
Modified: ipcop/trunk/config/cfgroot/backup-include
===================================================================
--- ipcop/trunk/config/cfgroot/backup-include 2012-02-29 17:46:07 UTC (rev
6436)
+++ ipcop/trunk/config/cfgroot/backup-include 2012-02-29 17:46:59 UTC (rev
6437)
@@ -15,4 +15,9 @@
/etc/ssh/ssh_host_rsa_key.pub
/etc/udev/rules.d/70-persistent-net.rules
/var/ipcop/
+/var/lib/squidguard/db/custom/allowed/domains
+/var/lib/squidguard/db/custom/allowed/urls
+/var/lib/squidguard/db/custom/blocked/domains
+/var/lib/squidguard/db/custom/blocked/expressions
+/var/lib/squidguard/db/custom/blocked/urls
/var/log/ntp/
Modified: ipcop/trunk/config/rootfiles/common/ipcop
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop 2012-02-29 17:46:07 UTC (rev
6436)
+++ ipcop/trunk/config/rootfiles/common/ipcop 2012-02-29 17:46:59 UTC (rev
6437)
@@ -1,4 +1,14 @@
etc/isdn-card-list
etc/nic-modules-list
+var/lib/squidguard
+var/lib/squidguard/db
+var/lib/squidguard/db/custom
+var/lib/squidguard/db/custom/allowed
+var/lib/squidguard/db/custom/allowed/domains
+var/lib/squidguard/db/custom/allowed/urls
+var/lib/squidguard/db/custom/blocked
+var/lib/squidguard/db/custom/blocked/domains
+var/lib/squidguard/db/custom/blocked/expressions
+var/lib/squidguard/db/custom/blocked/urls
var/log/dyndns
var/log/fw_timeframe_log
Modified: ipcop/trunk/lfs/ipcop
===================================================================
--- ipcop/trunk/lfs/ipcop 2012-02-29 17:46:07 UTC (rev 6436)
+++ ipcop/trunk/lfs/ipcop 2012-02-29 17:46:59 UTC (rev 6437)
@@ -92,6 +92,19 @@
mkdir -p /var/log/dyndns
chown nobody.nobody /var/log/dyndns
+ # URLfilter Database directory with custom blacklists
+ mkdir -p /var/lib/squidguard
+ mkdir -p /var/lib/squidguard/db
+ mkdir -p /var/lib/squidguard/db/custom
+ mkdir -p /var/lib/squidguard/db/custom/allowed
+ touch /var/lib/squidguard/db/custom/allowed/domains
+ touch /var/lib/squidguard/db/custom/allowed/urls
+ mkdir -p /var/lib/squidguard/db/custom/blocked
+ touch /var/lib/squidguard/db/custom/blocked/domains
+ touch /var/lib/squidguard/db/custom/blocked/expressions
+ touch /var/lib/squidguard/db/custom/blocked/urls
+ chown -R nobody:nobody /var/lib/squidguard/db
+
# Copy initial configfiles
cp $(DIR_SRC)/config/cfgroot/backup-exclude
$(CONFIG_ROOT)/backup/exclude.system
cp $(DIR_SRC)/config/cfgroot/backup-include
$(CONFIG_ROOT)/backup/include.system
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-02-29 17:46:07 UTC (rev 6436)
+++ ipcop/trunk/updates/2.1.0/setup 2012-02-29 17:46:59 UTC (rev 6437)
@@ -44,7 +44,33 @@
chown nobody:nobody /var/ipcop/proxy/redirector/urlfilter
fi
+if [ ! -e /var/lib/squidguard ]; then
+ mkdir -p /var/lib/squidguard
+fi
+if [ ! -e /var/lib/squidguard/db ]; then
+ mkdir -p /var/lib/squidguard/db
+fi
+if [ ! -e /var/lib/squidguard/db/custom ]; then
+ mkdir -p /var/lib/squidguard/db/custom
+fi
+if [ ! -e /var/lib/squidguard/db/custom/allowed ]; then
+ mkdir -p /var/lib/squidguard/db/custom/allowed
+fi
+touch /var/lib/squidguard/db/custom/allowed/domains
+touch /var/lib/squidguard/db/custom/allowed/urls
+
+if [ ! -e /var/lib/squidguard/db/custom/blocked ]; then
+ mkdir -p /var/lib/squidguard/db/custom/blocked
+fi
+
+touch /var/lib/squidguard/db/custom/blocked/domains
+touch /var/lib/squidguard/db/custom/blocked/expressions
+touch /var/lib/squidguard/db/custom/blocked/urls
+
+chown -R nobody:nobody /var/lib/squidguard/db
+
+
#####
#
# End of version specific handling. Continue with universal stuff.
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
