From owner-svn-src-head@FreeBSD.ORG  Sun Jan 25 15:44:47 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4A700710;
 Sun, 25 Jan 2015 15:44:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 34F8B218;
 Sun, 25 Jan 2015 15:44:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0PFil9j034872;
 Sun, 25 Jan 2015 15:44:47 GMT (envelope-from des@FreeBSD.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0PFil1r034871;
 Sun, 25 Jan 2015 15:44:47 GMT (envelope-from des@FreeBSD.org)
Message-Id: <201501251544.t0PFil1r034871@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: des set sender to des@FreeBSD.org
 using -f
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Sun, 25 Jan 2015 15:44:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277706 - head/etc/rc.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2015 15:44:47 -0000

Author: des
Date: Sun Jan 25 15:44:46 2015
New Revision: 277706
URL: https://svnweb.freebsd.org/changeset/base/277706

Log:
  Allow the user to specify the location of control.conf.

Modified:
  head/etc/rc.d/local_unbound

Modified: head/etc/rc.d/local_unbound
==============================================================================
--- head/etc/rc.d/local_unbound	Sun Jan 25 15:09:52 2015	(r277705)
+++ head/etc/rc.d/local_unbound	Sun Jan 25 15:44:46 2015	(r277706)
@@ -26,6 +26,7 @@ pidfile="/var/run/${name}.pid"
 : ${local_unbound_config:=${local_unbound_workdir}/unbound.conf}
 : ${local_unbound_flags:=-c${local_unbound_config}}
 : ${local_unbound_forwardconf:=${local_unbound_workdir}/forward.conf}
+: ${local_unbound_controlconf:=${local_unbound_workdir}/control.conf}
 : ${local_unbound_anchor:=${local_unbound_workdir}/root.key}
 : ${local_unbound_forwarders:=}
 
@@ -66,6 +67,7 @@ local_unbound_setup()
 	    -w ${local_unbound_workdir} \
 	    -c ${local_unbound_config} \
 	    -f ${local_unbound_forwardconf} \
+	    -o ${local_unbound_controlconf} \
 	    -a ${local_unbound_anchor} \
 	    ${local_unbound_forwarders}
 }