From nobody Mon Feb 13 10:58:50 2023 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 4PFhCv0gQ9z3q2ML; Mon, 13 Feb 2023 10:58:51 +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 4PFhCv05hQz3mp8; Mon, 13 Feb 2023 10:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676285931; 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=HKHQIcjbcXQ1sy3GJBmbK9IzIxXRqApV3CprA92w3UY=; b=fBiBS8LwRNM9DwUCVKgZbVxyWSxI1ZD5zkU4HwFfy/FMaAHi7ZI4aebTtGQvgregdPXULj 9OqY2qJXHNG96wa1Yt52lAyvgEuRLDh3HRL2h4roK3XQpoJ22pVbKnrMG5xZdfa54ECUVF K9pWUaOJxG+t+k79u6eLrKygmL91uINEJdhSuAcybIkwjqj+9SgWwHueUKP7vQ+551T2C7 l2+XWIBeSXp07e7eTxP8+OVOJtLLcFa55vuoqRhVRLgV1SiP/NoIJQoap+fjrm4qsiOn68 xvdFnFZi1uKgdDJytDPhujqF8ixsBys10FuvOPKVi9XHJtktToqZxHIMlqhZOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676285931; 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=HKHQIcjbcXQ1sy3GJBmbK9IzIxXRqApV3CprA92w3UY=; b=CGmeFrrynp5hcI5dCx2DM57TnPnaeI3YkIw2vpRS1cYrGZ7PNtlAxER22mgXzyD+LbuRmD T5Qg0Nba9s/nZBR0JLauEd2Ue4EO8wUQTXuHdsYFRJChflTa6SzoMqQTZZL0V9cKbsoBPK jtkJFilZfYnsl+PPMmpfDArPFR1WnSDCcNK6zw2FouH4G/iiLefQF3y0Ct7Httk7dBLo5z qF9emGD3XOiMmHv5m7helN31x4ovVoZaNQBRpdVlCx2yMCW5pmc43cNrD60Nu7ZJCkpriA fvLgdj6Powzf397fLo5l7SeABaqgrxzk4s2or+Zh8QJvC/ir7/2SE8i7DWo1RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676285931; a=rsa-sha256; cv=none; b=hOvbPFFPafnvSz6oq6fu6swa0zfcaylPFec07Xk7YMFFvNBKphW6nkXGaFZLGG6RyFPbDQ 6g27wVmoPx53uKvKdFDbmOqsVJo6rrUxg2WiJcY5+51CmtwAzZGUHqoMA/5DjtiN/kSU35 Rbc2CCdNQJRS+Bw0Q1ZE/IRHWG6knqs1A5PzE2syPywC4BBiCMy+dEk8BZYXf6VHNIonop TyxQmoosyEVT7i0ZqrSrMScz86EWVhbsUuZlDHyYFWrfhvWC6HOQeihNf+AC4biJr5XHpn ZM+hQFXkAIGVafjf25AvGy7/KEN5RXl1NlnUQFLAWHPyHSAXGJBCZFUUd/BdyQ== 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 4PFhCt69L6zFwq; Mon, 13 Feb 2023 10:58:50 +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 31DAwo8P080471; Mon, 13 Feb 2023 10:58:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DAwoQM080470; Mon, 13 Feb 2023 10:58:50 GMT (envelope-from git) Date: Mon, 13 Feb 2023 10:58:50 GMT Message-Id: <202302131058.31DAwoQM080470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tijl Coosemans Subject: git: 412d15f7268e - stable/13 - local-unbound-setup: Use default root certificates 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 412d15f7268e0662909822b1aef71536a2b285e5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=412d15f7268e0662909822b1aef71536a2b285e5 commit 412d15f7268e0662909822b1aef71536a2b285e5 Author: Tijl Coosemans AuthorDate: 2023-01-19 17:13:35 +0000 Commit: Tijl Coosemans CommitDate: 2023-02-13 10:52:20 +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 (cherry picked from commit 8932f7ce1783a10e9ba79c61d54077aa7693552e) --- 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