From nobody Thu Dec 02 01:08:32 2021 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 2D78518AC1BD; Thu, 2 Dec 2021 01:08:33 +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 4J4Hrw4hjWz3pbC; Thu, 2 Dec 2021 01:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 82ABB14499; Thu, 2 Dec 2021 01:08:32 +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 1B218WHT054853; Thu, 2 Dec 2021 01:08:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B218WaW054852; Thu, 2 Dec 2021 01:08:32 GMT (envelope-from git) Date: Thu, 2 Dec 2021 01:08:32 GMT Message-Id: <202112020108.1B218WaW054852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 23e8078bcc0f - stable/13 - rc.conf.5: Add entries for NFS 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 23e8078bcc0fe59b2cf0de537db4887c7018aa79 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638407312; 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=wo2I6Y58jAFOM6MIU+pfM0Izcy7wroe2bEVfycDQVGk=; b=JNQDior3/TBnsd/NJZa1mDYAsJ0STJ7LKN7RjMNhq1uwcLpV74nS9CqsY2WhWWRWdlsIBA rDP3pnUf/vGe/Q4ESP8yNiIZAHPduifNZYoq/azxzU/EvpCqtIt/Nd07ErA0b/5bWHzO2a h6eq7X0lbzVDWjeb6wNNSySopeeiGHzFGkf1UKw9DoI54zn+yAkrYHOahOnROub5Z32koZ sh/3B+f/45y6zobOs00/mJ7Y9SyQdIe3VF+3559bbqIsOWZnBdoemWheRmOrvMxh0zqkBQ 6aQK0mM7jN9kpz1u+XPOPALUxmc+hBwNpX8TnWevnRut3qREVjxExcX7ZxxNaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638407312; a=rsa-sha256; cv=none; b=Z9CCt8MgWbJ9NGnXI9C/qCSmF+J+Au9+FqcZmW5R71sKGGifa/9Z1BgL/KoCtANVvSNNR3 cCSzeZy455s+CVjIDKQc1j/rCAqOLCBjgNDWKQZButMiZSJvD7lL9qTRfgFvVkOETmbPte O7iSVcn/qwbIa9lPMHj1AeU1cPdfvl89n5KXIXRRNzXHnB1lK836A3yfjs0HHwIvpko/EU HW8WdTwMr9dTFpC8wlyXa11jVhHRocHXUxpqYZDHMg8bm0ySXZD1yeDdDd8B01NRPIIMGY DqQKFok8/i7vyDSSZMmSAHtwSojYxQ1JBIVOOx74/SjK0rIRP9PausLimlmsjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=23e8078bcc0fe59b2cf0de537db4887c7018aa79 commit 23e8078bcc0fe59b2cf0de537db4887c7018aa79 Author: Rick Macklem AuthorDate: 2021-11-18 15:59:34 +0000 Commit: Rick Macklem CommitDate: 2021-12-02 01:05:12 +0000 rc.conf.5: Add entries for NFS Entries for a few recently defined rc variables were missing from rc.conf.5. This patch adds those. It was not obvious to me what the ordering is, so I added them to the area where other nfsd related variables are. I can easily move them. I also replaced "are" with "is", since it seems to read better. This is a content change. (cherry picked from commit 9dae2d03bc644be38196cf76c55039af1a7c1ba6) --- share/man/man5/rc.conf.5 | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 96db269407cd..883937a619ee 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 5, 2021 +.Dd November 18, 2021 .Dt RC.CONF 5 .Os .Sh NAME @@ -2371,9 +2371,40 @@ is set to .Dq Li YES and .Va nfsv4_server_enable -are set to +is set to .Dq Li YES , enable the server for NFSv4 as well as NFSv2 and NFSv3. +.It Va nfsv4_server_only +.Pq Vt bool +If +.Va nfs_server_enable +is set to +.Dq Li YES +and +.Va nfsv4_server_only +is set to +.Dq Li YES , +enable the NFS server for NFSv4 only. +.It Va nfs_server_maxio +.Pq Vt int +value to set vfs.nfsd.srvmaxio to, which is the +maximum I/O size for the NFS server. +.It Va tlsclntd_enable +.Pq Vt bool +If set to +.Dq Li YES , +run the +.Xr rpc.tlsclntd 8 +daemon, which is needed for NFS-over-TLS NFS mounts. +.It Va tlsservd_enable +.Pq Vt bool +If set to +.Dq Li YES , +run the +.Xr rpc.tlsservd 8 +daemon, which is needed for the +.Xr nfsd 8 +to support NFS-over-TLS NFS mounts. .It Va nfsuserd_enable .Pq Vt bool If @@ -4649,6 +4680,8 @@ it will be made permanently active. .Xr routed 8 , .Xr rpc.lockd 8 , .Xr rpc.statd 8 , +.Xr rpc.tlsclntd 8 , +.Xr rpc.tlsservd 8 , .Xr rpcbind 8 , .Xr rwhod 8 , .Xr savecore 8 ,