From nobody Mon Aug 18 14:35:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c5FcS5MGhz641VS; Mon, 18 Aug 2025 14:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c5FcS4K16z46Kl; Mon, 18 Aug 2025 14:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755527720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltciqfCeA5cMOSL3RwwtY0mCPnhc29fNyZaYncv14ng=; b=ZqmtRx2A/FBKRccde9tu8LBX1EF6KJmrWyUFdCpumZDBWNfigpqqWa/CaLKtUwDEbI0+Vy igZ0nrb7EHWr/FIooaQj7M+O/0gpBKWOU5vA9N5nh3hl7IILtQwVxqyvK7DwiMia1IX26B zLp3Uug5dEqthDrHvmoyD8COHC04OYwuAB8SZba4uFKWal3+eB7TvEwmNNaOMePpEmy7SD 4JRsa7eTkQ997z4oqPlWTAAeiVuj3wIek6cKgadhdHB2l6yG/eTTeLfj7QeK76Qua8WlVf g7A7zUQpydA9e9i+CFXYfqKXKarORj1W4+bUoiyJaU0M7dqyTNP5AsoiehWSng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755527720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltciqfCeA5cMOSL3RwwtY0mCPnhc29fNyZaYncv14ng=; b=xGiyTenwEJx+ZlkGA/tdDNHUOCz0exButi9gjBKl+mdco35ZfyMTVdQLIc5OOsLgXxBAvY cBOriDz3hXQKSezpvX1aV5+egDDkTRj5b35dwthLFovwq+AWS+VIphHBd0pjf27kGIfbar UvFrqsdaHKmPp8ajd5z7Tpp6Qm0dn9APRIkrZmjD1dZDx7Ds03EInV0cIFI6Z6+50KN9p9 HaUzYrJZigyzKZdQPzYgrEA7pBM6rKUaHJDM/D53VWj/2elkrRj1964xhpqIudRQHPwi4V pneewDx126bq8mx5ANFUWmsMYRi/L8CJEJWk7WOzl3a4yKWTVfOL8NocnGxyOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755527720; a=rsa-sha256; cv=none; b=IyKSAB13ULxpoeyo9mtPIqcZDff/CYze1hvfLNsafpfzXJArKu4VQ/gTOefLHziPTykVz4 we+0KQU9qotzjQLYOXg26HemCUjh4RVrvcilSJEiar6QTCMYZ2mG4OUjw6SUgV2BZTVuWo JIemo9ggRfbRaDlCLbFhpFykWMfqow/vLDkhR0D4okJ7IZV6EeGH7L1UXX1+lU3GmPJgQN aqAFXt+sASmzmQTpRVY5cQ/AMdRvk1LRHPpuq2XKiFlwNpQbOrpkdk7WCfHZmFTO6qruno cF5tMau3TpCaNGsBP+c9nYN/U66hrx4Wl84v2mQ3gi1Jf1SLoosH0PVzOkCkfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c5FcS3r9yz114S; Mon, 18 Aug 2025 14:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57IEZKmp065213; Mon, 18 Aug 2025 14:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IEZKL4065210; Mon, 18 Aug 2025 14:35:20 GMT (envelope-from git) Date: Mon, 18 Aug 2025 14:35:20 GMT Message-Id: <202508181435.57IEZKL4065210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e687f38a36ce - main - local-unbound-setup: If TLS is enabled, use the certificate bundle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e687f38a36ceb681ff7fe0668050f95828f73831 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e687f38a36ceb681ff7fe0668050f95828f73831 commit e687f38a36ceb681ff7fe0668050f95828f73831 Author: Dag-Erling Smørgrav AuthorDate: 2025-08-18 14:31:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-08-18 14:31:42 +0000 local-unbound-setup: If TLS is enabled, use the certificate bundle Now that certctl(8) always produces a bundle, use it in preference to the hashed directory, since the latter cannot be preloaded before chrooting. --- usr.sbin/unbound/setup/local-unbound-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/unbound/setup/local-unbound-setup.sh b/usr.sbin/unbound/setup/local-unbound-setup.sh index d52534b46fa3..d57d74952fc7 100755 --- a/usr.sbin/unbound/setup/local-unbound-setup.sh +++ b/usr.sbin/unbound/setup/local-unbound-setup.sh @@ -259,7 +259,7 @@ gen_unbound_conf() { echo " pidfile: ${pidfile}" echo " auto-trust-anchor-file: ${anchor}" if [ "${use_tls}" = "yes" ] ; then - echo " tls-system-cert: yes" + echo " tls-cert-bundle: /etc/ssl/cert.pem" fi echo "" if [ -f "${forward_conf}" ] ; then