From nobody Tue Feb 7 10:22:14 2023 X-Original-To: dev-commits-src-main@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 4P9zhR11J9z3knXH; Tue, 7 Feb 2023 10:22:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9zhQ5l3Mz4Np8; Tue, 7 Feb 2023 10:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675765334; 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=O6+vtc/GGXhq+4Jd/84/2bhjUtET+99wpVkcgSdYKCM=; b=jHB3IkZO79ZYYZiONWwqnkHRcbreBi5SldSruSPcndRFrazmtNvGIt3rS5pSIJitVoqRhm BCGF305MKPiEJ5xrU3n4jIqA005qpy2q7R6GfXY37a6B8/AQtMPJZVi2NMj/hYrkgzJIUx uJARHGNlwbBZUyvkaY+MSPm3LHtZIKqasJpgtcBOCFjVXJBGMqn7sLc0EFWlHnnd6kwxVh AO+x4CanWDcqD7gSEQJjMcwOCyZ/rzeoRY+so922nu7ynAjcQHpYu+atQYZdJ+LVc2YjBl oYDS2trsxcuVvcy4TGc+GsuhYx5PoIZJ3TF7xcUGqb9m4WbiLqNomkiRRBMbyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675765334; 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=O6+vtc/GGXhq+4Jd/84/2bhjUtET+99wpVkcgSdYKCM=; b=WACpEa3jdcCQ3JLC9dHtgKFMhCDnPrWVVkei5M+Q5eZsx+5Z1N3aGVVpM4iql/4MBw1j5V aJVL9A3jeZeMiAEzGwYp/K1cO8dkFCI3IflyuTn1kjYall0Gogxe+4qbyyoKfGT7nsqReR XVO+J1lJaA1nguwUUlTCvVgpKoBaz+UzcaJjOnFZBSBySZPo4BrL4n45LSAWU/PLvSo2KP JcdvZQ5gp3jrYfHDjdmPU1fO9yynOX1WvoqdR3vvdT6p1qiGrkioWb/8cAc2VD1tbm0L+R n9/2wcKU+pMLKRZo8BVwttHU39FAaHdctSjo4OzN3ZnK/itAXqwlONdLO3xVQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675765334; a=rsa-sha256; cv=none; b=pPzxcHC5LMONivAnB7gppRveZ7FHxBjyILMLeGhzC4qStI/VAl3zLgNzfRTOOZP5+itlj4 cevUyM+JEZhRBDgrk6eddewZgBrOVvLM6TDg6WrN5VToE54U2g+5evq0MXK4nP44Ba/YcV 0RA+CSGbHCPbj69fC19+GE5WVSkWeu/M1Qf0iZ/pcneSW7B92lJZJ4DzOsuCh8UusYXC6w FFrk0coMJiH6jgZiLzRcmXMlguTKAJDKVT/Nyok34qM6Zauko4VLmospSPxA4WqcWzSXBM /1zIz3VxPtmh0GvNY8V5L8ZiGyvFgvtWNCN3ovEfNo4KiEsOm60psAsoYeAAoQ== 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 4P9zhQ4ppYz1CDC; Tue, 7 Feb 2023 10:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 317AMEUu090813; Tue, 7 Feb 2023 10:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 317AMEW2090812; Tue, 7 Feb 2023 10:22:14 GMT (envelope-from git) Date: Tue, 7 Feb 2023 10:22:14 GMT Message-Id: <202302071022.317AMEW2090812@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tijl Coosemans Subject: git: 8932f7ce1783 - main - local-unbound-setup: Use default root certificates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8932f7ce1783a10e9ba79c61d54077aa7693552e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=8932f7ce1783a10e9ba79c61d54077aa7693552e commit 8932f7ce1783a10e9ba79c61d54077aa7693552e Author: Tijl Coosemans AuthorDate: 2023-01-19 17:13:35 +0000 Commit: Tijl Coosemans CommitDate: 2023-02-07 10:13:33 +0000 local-unbound-setup: Use default root certificates Don't force /etc/ssl/cert.pem. It does not exist by default, only if security/ca_root_nss is installed. Just use the default OpenSSL search locations which are /etc/ssl/cert.pem and /etc/ssl/certs/. The tls-system-cert option was added in Unbound 1.16.0. Reviewed by: zlei MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D38243 --- 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 3be78339b0ba..dc0768a672a6 100755 --- a/usr.sbin/unbound/setup/local-unbound-setup.sh +++ b/usr.sbin/unbound/setup/local-unbound-setup.sh @@ -260,7 +260,7 @@ gen_unbound_conf() { echo " pidfile: ${pidfile}" echo " auto-trust-anchor-file: ${anchor}" if [ "${use_tls}" = "yes" ] ; then - echo " tls-cert-bundle: /etc/ssl/cert.pem" + echo " tls-system-cert: yes" fi echo "" if [ -f "${forward_conf}" ] ; then