From nobody Mon Feb 13 11:41:57 2023 X-Original-To: dev-commits-src-branches@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 4PFj9f1TMsz3qMd2; Mon, 13 Feb 2023 11:41:58 +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 4PFj9f12bcz3rjk; Mon, 13 Feb 2023 11:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676288518; 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=7E04MHfdHglgGizkawX615DthpOJW9yIK392RhE1KPc=; b=rjnx7L7IpR1G/EoNfayABmKkkbSxsEU2L+IcuVo6jfUlcGXA0HcFnqP0aY7rxcOIedbYdd r5OxVE1pwfkj6kBB8ML4OEIGOYZu4XhS4Mas6ZvtgaAYDO8rWltGh0X3o3ZGJs0DiIHf8i xu4PQHzVaU/BI/VGFAJd5vvXhegEbx32G+afX1BtJjDZ5dn0yc+l1Vm6E9EMLEjHm+uShw 6aV3zxrOJUstGDA94HcdZ03CgsKTb37CxAJNqu4b4p0tl8qouud8Zi6fj9nUjAMpGB1OcO u8aNmYUc2mPKqbfoA7XHe4jbVZQaO8h1uFePBEtvXgcLJMvLS30yCOk1RCNyHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676288518; 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=7E04MHfdHglgGizkawX615DthpOJW9yIK392RhE1KPc=; b=tRwzYAKaAkNk3g0VvKF9wW6Iu4Fy5cx88anrm5f3UnHev8JiLGlOJrSB718TDmEXAjLLKc bgyJh0Zi5+UwbGaydzehSc7ED42h1EABFJ2zXaFopZ0V2kuvbf6L/+H8Hv+zOvbJ+fd6nY x95eWBkFsvdGmdWFgAdZTn9nfCYCIBzzxcRQBz3u4QpIEwXaQYnsEzBJ3WmfJFNnsI2mif SF7vVfPy6Dja4klfiAbm5dxrv1tFq6LcQ/HT4T+tM9gOMAaR+CIUuywctJNK4/CYcDW797 WtTZeR8+yWfQEIRLiYq0FeWVYTS+hAgSZ8dwjqxSIPkQ/twNgJGKEE2Fl4Imbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676288518; a=rsa-sha256; cv=none; b=ZUyNzKtDlGeW/o0JknFe8MtbBHr2U5wqq0p/pz8cU+VTdtJFaJE0pzBSLpqqC2s6DC84D4 FfbNCuYIkW7KEa7PaD90tVW2GTi5GTrXgdqswwu/G5DMY0EldREc7ktv5bUNwFVYURxCzi ksyZ07NqvBNyn/b9abc2NYVwDjY2xtnQiQ4vROSYgMiCU/4r++AhOSFmk2Hw5p3mzn3MId 5YBBWxnyEPHT3mtm7VbxSbOFlIJrdI8h5WPoOP4sTwLHYLwvR3vBz0gcccxW7I5Q3Uiyc3 EqDer6KV0JkEddQ530txUsATiVsETm8m6xnXwdGGdq8zc4e4UfDA5tGAU4UxAg== 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 4PFj9f04qfzH77; Mon, 13 Feb 2023 11:41:58 +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 31DBfvcL051391; Mon, 13 Feb 2023 11:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DBfvSX051390; Mon, 13 Feb 2023 11:41:57 GMT (envelope-from git) Date: Mon, 13 Feb 2023 11:41:57 GMT Message-Id: <202302131141.31DBfvSX051390@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: f73d4bfc1385 - stable/12 - local-unbound-setup: Use default root certificates List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: f73d4bfc1385072559659d5cded1a714e797d37b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=f73d4bfc1385072559659d5cded1a714e797d37b commit f73d4bfc1385072559659d5cded1a714e797d37b Author: Tijl Coosemans AuthorDate: 2023-01-19 17:13:35 +0000 Commit: Tijl Coosemans CommitDate: 2023-02-13 11:40:50 +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 0a3b80b18e60..b6fa4112096e 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