[gentoo-commits] gentoo-x86 commit in net-proxy/ufdbguard/files: ufdb.confd ufdb.initd

[Diego Petteno (flameeyes)]

flameeyes    11/05/01 16:05:51

  Modified:             ufdb.confd ufdb.initd
  Log:
  Update init script to wait to see if ufdb successfully started; add urls to the generated tables if present; add a variable to set options for ufdbGenTable and default to -W.
  
  (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-proxy/ufdbguard/files/ufdb.confd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/files/ufdb.confd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/files/ufdb.confd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/files/ufdb.confd?r1=1.1&r2=1.2

Index: ufdb.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.confd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ufdb.confd	7 Dec 2010 09:11:50 -0000	1.1
+++ ufdb.confd	1 May 2011 16:05:50 -0000	1.2
@@ -1,9 +1,13 @@
 # -*- sh -*-
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.confd,v 1.1 2010/12/07 09:11:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.confd,v 1.2 2011/05/01 16:05:50 flameeyes Exp $
 
 # Tables to re-generate when starting or reloading ufdbguard
 UFDB_GT="alwaysallow alwaysdeny"
 
+# Options passed to ufdbGenTable when generating the tables listed in
+# UFDB_GT
+GENTABLE_OPTIONS="-W"
+
 # User under which to run ufdbguard; it should be the same as the
 # proxy server you're using, so by default it is squid.
 UFDB_USER="squid"



1.2                  net-proxy/ufdbguard/files/ufdb.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd?r1=1.1&r2=1.2

Index: ufdb.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ufdb.initd	7 Dec 2010 09:11:50 -0000	1.1
+++ ufdb.initd	1 May 2011 16:05:50 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd,v 1.1 2010/12/07 09:11:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/ufdbguard/files/ufdb.initd,v 1.2 2011/05/01 16:05:50 flameeyes Exp $
 
 # reconfig is what the upstream documentation suggests, so let's
 # provide it for compatibility.
@@ -21,10 +21,14 @@
 	local dbhome=$(get_config dbhome)
 
 	for gt in ${UFDB_GT} ; do
-		if [ -f "${dbhome}/${gt}/domains" ] ; then
-			einfo "Generating domainlist ${gt}"
-			ufdbGenTable -t "${gt}" -d "${dbhome}/${gt}/domains"
-		fi
+		[ -f "${dbhome}/${gt}/domains" ] || continue
+
+		urls=
+		[ -f "${dbhome}/${gt}/urls" ] && urls="${dbhome}/${gt}/urls"
+
+		ebegin "Generating domainlist ${gt}"
+		ufdbGenTable ${GENTABLE_OPTIONS} -t "${gt}" -d "${dbhome}/${gt}/domains" ${urls:+-u "${urls}"}
+		eend $?
 	done
 }
 
@@ -44,7 +48,9 @@
 	fi
 
 	ebegin "Starting ufdbGuard"
-	start-stop-daemon --start --chuid ${UFDB_USER} \
+	start-stop-daemon --start \
+		--chuid ${UFDB_USER} \
+		--wait 1500 \
 		--exec /usr/libexec/ufdbguard/ufdbguardd \
 		--pidfile /var/run/ufdbguard/ufdbguardd.pid -- \
 		-c /etc/ufdbGuard.conf ${UFDB_OPTS}