From nobody Wed Feb 15 08:45:39 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 4PGs9H5MsMz3rVrs; Wed, 15 Feb 2023 08:45:39 +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 4PGs9H4q45z3v5N; Wed, 15 Feb 2023 08:45:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676450739; 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=IRQQuTXjazyAVyCIXtTsZqL9larUBish/pJcCY5sQBY=; b=Qq5xqhLkQIrjIozUmPeOPqFUJTZIihCf+R1s1NgNGNuSpVZJyAVU2HLtZcu/Y2cBqqqkVp l2VkhxEFIbq8tOZhwmduGwOl4tHq0u0WU8ii033n8hOP8QpG7dWSMuKJQ5ky4oJ/Ao5sIW RmX3WJDEwvGWq571jjNMEcCEH2lK+TvxnlUMB2ID7C236rjobhC7Uj2AphErNLKrQFQ6/7 0wxVdjDezmK4EUFdt+aiwH3OvDoz8vLlw2LRgbGpGx0fqj2ad/9fKxrChD5SpDZKEIHE2r llQF9PRMvFNROWF17Cp4rhXmM4iQeHG05usIBGOv2mWTPxBLjDi1XwBPxNj90Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676450739; 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=IRQQuTXjazyAVyCIXtTsZqL9larUBish/pJcCY5sQBY=; b=ayJxSvcaLrngmjoC00QhRxmI+DRD51JsZLwa7mCFdwIQnvJLom4M9J0w+geZzLZuLer0/v bx6svCGVqIh+41ZCNinKJmkmlDdTrZjs2KTAkLd6paufB1wlyvF1pQxEksF42geGG10w0s mdoVjFEKVYxyxVUy8pk/Q6I86DgDU41TEusdkcZl+mV+IzkZmWsBlgbipskjOk3rexkwAC 8QgcGjWwDHszN6ae/c6mzsad1+si970BDvRzActVVMBAy1kQk3GhRqVaa+pRORObqKiH8t hMogJsihoqDl/eLMR+7bdJbfQg3GoaJ4eUsEc1cnaya50UUxmvhPNU8Uustcdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676450739; a=rsa-sha256; cv=none; b=PGkUZTyrVNdCsZuZBmJXA/48RDNcT04vEnRGdAMIlTCw0e++j+ioEzNQ52ghqY+mgWN1hu kQ12ySmTvSPoPKO6NusNWwM+ORF7IvlwdeySVY1Pwgu2NVyG935lkkW9SD10IMv2rcOs4k BNfr3jIJrMBkJ4+tBRfcRq8L60VUqBhVDuXcC4XXBs5JYRHCfwBr+EUnrfOlPfdD1QXMPS w8Frb816tfjL8h46EcSswrEpFITBOqUVV7qle55eayaTAKbin/9vjJp7uPLgIGUZEC2q7y 7Eb4J5PUYmVmMzFbDccu4/gWhJTh+4Pzny1WxipKbWYAlIWHzeQOCINMmwrrNw== 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 4PGs9H3sJTzJ93; Wed, 15 Feb 2023 08:45:39 +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 31F8jd7W017278; Wed, 15 Feb 2023 08:45:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31F8jdb0017277; Wed, 15 Feb 2023 08:45:39 GMT (envelope-from git) Date: Wed, 15 Feb 2023 08:45:39 GMT Message-Id: <202302150845.31F8jdb0017277@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: d6ab6f93ef94 - releng/13.2 - 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: d6ab6f93ef94784426083516a857eb9f2441414f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=d6ab6f93ef94784426083516a857eb9f2441414f commit d6ab6f93ef94784426083516a857eb9f2441414f Author: Tijl Coosemans AuthorDate: 2023-01-19 17:13:35 +0000 Commit: Tijl Coosemans CommitDate: 2023-02-15 08:42:04 +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 Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D38243 (cherry picked from commit 8932f7ce1783a10e9ba79c61d54077aa7693552e) (cherry picked from commit 412d15f7268e0662909822b1aef71536a2b285e5) --- 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