[gentoo-commits] gentoo-x86 commit in net-dns/bind/files: named.init-r10 named.confd-r6

[Christian Ruppert (idl0r)]

idl0r       11/02/25 12:42:11

  Added:                named.init-r10 named.confd-r6
  Log:
  Revision bumps.
  
  Create /var/bind/dyn by default, writeable by bind itself, bug 354679.
  Add a CHROOT_NOCHECK option to the init/conf.d script, bug 354375.
  Add sdb-ldap back in bind 9.7.3-r1, bug 302735.
  
  (Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-dns/bind/files/named.init-r10

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r10?rev=1.1&content-type=text/plain

Index: named.init-r10
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r10,v 1.1 2011/02/25 12:42:11 idl0r Exp $

opts="start stop reload restart checkconfig checkzones"

depend() {
	need net
	use logger
	provide dns
}

NAMED_CONF=${CHROOT}/etc/bind/named.conf

_mount() {
	local from
	local to
	local opts

	if [ "${#}" -lt 3 ]; then
		eerror "_mount(): to few arguments"
		return 1
	fi

	from=$1
	to=$2
	shift 2

	opts="${*}"
	shift $#

	if [ -z "$(awk "\$2 == \"${to}\" { print \$2 }" /proc/mounts)" ]; then
		einfo "mounting ${from} to ${to}"
		mount ${from} ${to} ${opts} || return 1
	fi

	return 0
}

_umount() {
	local dir=$1

	if [ -n "$(awk "\$2 == \"${dir}\" { print \$2 }" /proc/mounts)" ]; then
		einfo "umount ${dir}"
		umount ${dir} || return 1
	fi

	return 0
}

_get_pidfile() {
	# as suggested in bug #107724, bug 335398#c17
	[ -n "${PIDFILE}" ] || PIDFILE=${CHROOT}$(\
			/usr/sbin/named-checkconf -p ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}} | grep 'pid-file' | cut -d\" -f2)
	[ -z "${PIDFILE}" ] && PIDFILE=${CHROOT}/var/run/named/named.pid
}

check_chroot() {
	if [ -n "${CHROOT}" ]; then
		[ ! -d "${CHROOT}" ] && return 1
		[ ! -d "${CHROOT}/dev" ] || [ ! -d "${CHROOT}/etc" ] || [ ! -d "${CHROOT}/var" ] && return 1
		[ ! -d "${CHROOT}/var/run" ] || [ ! -d "${CHROOT}/var/log" ] && return 1
		[ ! -d "${CHROOT}/etc/bind" ] || [ ! -d "${CHROOT}/var/bind" ] && return 1
		[ ! -d "${CHROOT}/var/log/named" ] && return 1
		[ ! -e "${CHROOT}/etc/localtime" ] && return 1
		[ ! -c "${CHROOT}/dev/null" ] || [ ! -c "${CHROOT}/dev/zero" ] && return 1
		[ ! -c "${CHROOT}/dev/random" ] && [ ! -c "${CHROOT}/dev/urandom" ] && return 1
		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && [ ! -d "${CHROOT}/usr/share/GeoIP" ] && return 1
	fi

	return 0
}

checkconfig() {
	ebegin "Checking named configuration"

	if [ ! -f "${NAMED_CONF}" ] ; then
		eerror "No ${NAMED_CONF} file exists!"
		return 1
	fi

	/usr/sbin/named-checkconf ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}} || {
		eerror "named-checkconf failed! Please fix your config first."
		return 1
	}

	eend 0
	return 0
}

checkzones() {
	ebegin "Checking named configuration and zones"
	/usr/sbin/named-checkconf -z -j ${CHROOT:+-t} ${CHROOT} ${NAMED_CONF/${CHROOT}}
	eend $?
}

start() {
	local piddir

	ebegin "Starting ${CHROOT:+chrooted }named"

	if [ -n "${CHROOT}" -a "${CHROOT_NOCHECK:-0}" -eq 0 ]; then
		check_chroot || {
			eend 1
			eerror "Your chroot dir ${CHROOT} is inconsistent, please run 'emerge --config net-dns/bind' first"
			return 1
		}

		if [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
			einfo "Mounting chroot dirs"
			_mount /etc/bind ${CHROOT}/etc/bind -o bind
			_mount /var/bind ${CHROOT}/var/bind -o bind
			_mount /var/log/named ${CHROOT}/var/log/named -o bind
			if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
				_mount /usr/share/GeoIP ${CHROOT}/usr/share/GeoIP -o bind
			fi
		fi
	fi

	checkconfig || { eend 1; return 1; }

	# create piddir (usually /var/run/named) if necessary, bug 334535
	_get_pidfile
	piddir="${PIDFILE%/*}"
	if [ ! -d "${piddir}" ]; then
		checkpath -q -d -o root:named -m 0770 "${piddir}" || {
			eend 1
			return 1
		}
	fi

	# In case someone have $CPU set in /etc/conf.d/named
	if [ -n "${CPU}" ] && [ "${CPU}" -gt 0 ]; then
		CPU="-n ${CPU}"
	fi

	start-stop-daemon --start --pidfile ${PIDFILE} \
		--nicelevel ${NAMED_NICELEVEL:-0} \
		--exec /usr/sbin/named \
		-- -u named ${CPU} ${OPTIONS} ${CHROOT:+-t} ${CHROOT}
	eend $?
}

stop() {
	local reported=0

	ebegin "Stopping ${CHROOT:+chrooted }named"

	# Workaround for now, until openrc's restart has been fixed.
	# openrc doesn't care about a restart() function in init scripts.
	if [ "${RC_CMD}" = "restart" ]; then
		checkconfig || { eend 1; return 1; }
	fi

	# -R 10, bug 335398
	_get_pidfile
	start-stop-daemon --stop --retry 10 --pidfile $PIDFILE \
		--exec /usr/sbin/named

	if [ -n "${CHROOT}" ] && [ "${CHROOT_NOMOUNT:-0}" -eq 0 ]; then
		ebegin "Umounting chroot dirs"

		# just to be sure everything gets clean
		while fuser -s ${CHROOT} 2>/dev/null; do
			if [ "${reported}" -eq 0 ]; then
				einfo "Waiting until all named processes are stopped"
				reported=1
			fi
			sleep 1
		done

		[ "${CHROOT_GEOIP:-0}" -eq 1 ] && _umount ${CHROOT}/usr/share/GeoIP
		_umount ${CHROOT}/etc/bind
		_umount ${CHROOT}/var/log/named
		_umount ${CHROOT}/var/bind
	fi

	eend $?
}

reload() {
	local ret

	ebegin "Reloading named.conf and zone files"

	checkconfig || { eend 1; return 1; }

	_get_pidfile
	if [ -n "${PIDFILE}" ]; then
		# FIXME: Remove --stop and --oknodo as soon as baselayout-1 has been removed... finally...
		start-stop-daemon --stop --oknodo --pidfile $PIDFILE --signal HUP --exec /usr/sbin/named
		ret=$?
	else
		ewarn "Unable to determine the pidfile... this is"
		ewarn "a fallback mode. Please check your installation!"

		$RC_SERVICE restart
		ret=$?
	fi

	eend $ret
}



1.1                  net-dns/bind/files/named.confd-r6

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.confd-r6?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.confd-r6?rev=1.1&content-type=text/plain

Index: named.confd-r6
===================================================================
# Set various named options here.
#
#OPTIONS=""

# Set this to the number of processors you want bind to use.
# Leave this unchanged if you want bind to automatically detect the number
#CPU="1"

# If you wish to run bind in a chroot:
# 1) un-comment the CHROOT= assignment, below. You may use
#    a different chroot directory but MAKE SURE it's empty.
# 2) run: emerge --config =<bind-version>
#
#CHROOT="/chroot/dns"

# Uncomment to enable binmount of /usr/share/GeoIP
#CHROOT_GEOIP="1"

# Uncomment the line below to avoid that the init script mounts the needed paths
# into the chroot directory.
# You have to copy all needed config files by hand if you say CHROOT_NOMOUNT="1".
#CHROOT_NOMOUNT="1"

# Uncomment this option if you have setup your own chroot environment and you
# don't want/need the chroot consistency check
#CHROOT_NOCHECK=1

# Default pid file location
PIDFILE="${CHROOT}/var/run/named/named.pid"

# Scheduling priority: 19 is the lowest and -20 is the highest.
# Default: 0
#NAMED_NICELEVEL="0"

# Uncomment rc_named_use/rc_named_after for the database you need.
# Its necessary to ensure the database backend will be started before named.

# MySQL
#rc_named_use="mysql"
#rc_named_after="mysql"

# PostgreSQL
#rc_named_use="pg_autovacuum postgresql"
#rc_named_after="pg_autovacuum postgresql"

# LDAP
#rc_named_use="ldap"
#rc_named_after="ldap"