Date: Fri, 22 Nov 2013 13:41:34 +0000 (UTC) From: Erwin Lansing <erwin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334593 - in head/dns: bind96 bind96/files bind98 bind98/files bind99 bind99/files Message-ID: <201311221341.rAMDfY3g002148@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: erwin Date: Fri Nov 22 13:41:34 2013 New Revision: 334593 URL: http://svnweb.freebsd.org/changeset/ports/334593 Log: Fix startup script. PR: 184159 [1] Submitted by: Pawel Biernacki <pawel.biernacki@gmail.com> [1], Trond Endrestoel <Trond.Endrestol@ximalas.info> (private email) Modified: head/dns/bind96/Makefile head/dns/bind96/files/named head/dns/bind98/Makefile head/dns/bind98/files/named head/dns/bind99/Makefile head/dns/bind99/files/named Modified: head/dns/bind96/Makefile ============================================================================== --- head/dns/bind96/Makefile Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind96/Makefile Fri Nov 22 13:41:34 2013 (r334593) @@ -2,6 +2,7 @@ PORTNAME= bind96 PORTVERSION= 9.6.3.2.ESV.R10 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind96/files/named ============================================================================== --- head/dns/bind96/files/named Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind96/files/named Fri Nov 22 13:41:34 2013 (r334593) @@ -19,15 +19,15 @@ start_postcmd="named_poststart" reload_cmd="named_reload" stop_cmd="named_stop" -named_enable="NO" # Run named, the DNS server (or NO). -named_program="/usr/local/sbin/named" # Path to named, if you want a different one. -named_conf="/usr/local/etc/namedb/named.conf" # Path to the configuration file -#named_flags="" # Use this for flags OTHER than -u and -c -named_uid="bind" # User to run named as -named_wait="NO" # Wait for working name service before exiting -named_wait_host="localhost" # Hostname to check if named_wait is enabled -named_auto_forward="NO" # Set up forwarders from /etc/resolv.conf -named_auto_forward_only="NO" # Do "forward only" instead of "forward first" +named_enable=${named_enable:-"NO"} # Run named, the DNS server (or NO). +named_program=${named_program:-"/usr/local/sbin/named"} # Path to named, if you want a different one. +named_conf=${named_conf:-"/usr/local/etc/namedb/named.conf"} # Path to the configuration file +named_flags=${named_flags:-""} # Use this for flags OTHER than -u and -c +named_uid=${named_uid:-"bind"} # User to run named as +named_wait=${named_wait:-"NO"} # Wait for working name service before exiting +named_wait_host=${named_wait_host:-"localhost"} # Hostname to check if named_wait is enabled +named_auto_forward=${named_auto_forward:-"NO"} # Set up forwarders from /etc/resolv.conf +named_auto_forward_only=${named_auto_forward_only:-"NO"} # Do "forward only" instead of "forward first" named_poststart() { if checkyesno named_wait; then Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind98/Makefile Fri Nov 22 13:41:34 2013 (r334593) @@ -2,6 +2,7 @@ PORTNAME= bind98 PORTVERSION= 9.8.6 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind98/files/named ============================================================================== --- head/dns/bind98/files/named Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind98/files/named Fri Nov 22 13:41:34 2013 (r334593) @@ -19,15 +19,15 @@ start_postcmd="named_poststart" reload_cmd="named_reload" stop_cmd="named_stop" -named_enable="NO" # Run named, the DNS server (or NO). -named_program="%%PREFIX%%/sbin/named" # Path to named, if you want a different one. -named_conf="%%BIND_DESTETC%%/named.conf" # Path to the configuration file -#named_flags="" # Use this for flags OTHER than -u and -c -named_uid="bind" # User to run named as -named_wait="NO" # Wait for working name service before exiting -named_wait_host="localhost" # Hostname to check if named_wait is enabled -named_auto_forward="NO" # Set up forwarders from /etc/resolv.conf -named_auto_forward_only="NO" # Do "forward only" instead of "forward first" +named_enable=${named_enable:-"NO"} # Run named, the DNS server (or NO). +named_program=${named_program:-"/usr/local/sbin/named"} # Path to named, if you want a different one. +named_conf=${named_conf:-"/usr/local/etc/namedb/named.conf"} # Path to the configuration file +named_flags=${named_flags:-""} # Use this for flags OTHER than -u and -c +named_uid=${named_uid:-"bind"} # User to run named as +named_wait=${named_wait:-"NO"} # Wait for working name service before exiting +named_wait_host=${named_wait_host:-"localhost"} # Hostname to check if named_wait is enabled +named_auto_forward=${named_auto_forward:-"NO"} # Set up forwarders from /etc/resolv.conf +named_auto_forward_only=${named_auto_forward_only:-"NO"} # Do "forward only" instead of "forward first" named_poststart() { if checkyesno named_wait; then Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind99/Makefile Fri Nov 22 13:41:34 2013 (r334593) @@ -2,7 +2,7 @@ PORTNAME?= bind99 PORTVERSION= 9.9.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind99/files/named ============================================================================== --- head/dns/bind99/files/named Fri Nov 22 13:34:33 2013 (r334592) +++ head/dns/bind99/files/named Fri Nov 22 13:41:34 2013 (r334593) @@ -19,15 +19,15 @@ start_postcmd="named_poststart" reload_cmd="named_reload" stop_cmd="named_stop" -named_enable="NO" # Run named, the DNS server (or NO). -named_program="%%PREFIX%%/sbin/named" # Path to named, if you want a different one. -named_conf="%%BIND_DESTETC%%/named.conf" # Path to the configuration file -#named_flags="" # Use this for flags OTHER than -u and -c -named_uid="bind" # User to run named as -named_wait="NO" # Wait for working name service before exiting -named_wait_host="localhost" # Hostname to check if named_wait is enabled -named_auto_forward="NO" # Set up forwarders from /etc/resolv.conf -named_auto_forward_only="NO" # Do "forward only" instead of "forward first" +named_enable=${named_enable:-"NO"} # Run named, the DNS server (or NO). +named_program=${named_program:-"/usr/local/sbin/named"} # Path to named, if you want a different one. +named_conf=${named_conf:-"/usr/local/etc/namedb/named.conf"} # Path to the configuration file +named_flags=${named_flags:-""} # Use this for flags OTHER than -u and -c +named_uid=${named_uid:-"bind"} # User to run named as +named_wait=${named_wait:-"NO"} # Wait for working name service before exiting +named_wait_host=${named_wait_host:-"localhost"} # Hostname to check if named_wait is enabled +named_auto_forward=${named_auto_forward:-"NO"} # Set up forwarders from /etc/resolv.conf +named_auto_forward_only=${named_auto_forward_only:-"NO"} # Do "forward only" instead of "forward first" named_poststart() { if checkyesno named_wait; then @@ -92,6 +92,12 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi + echo ${pidfile%/pid} + if [ ! -d ${pidfile%/pid} ]; then + mkdir -p ${pidfile%/pid} + chown ${named_uid}:${named_uid} ${pidfile%/pid} + fi + command_args="-u ${named_uid:=root}" if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311221341.rAMDfY3g002148>