From nobody Fri Jul 22 00:27:59 2022 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 4Lpqz40fwDz4Wj7R; Fri, 22 Jul 2022 00:28:00 +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 4Lpqz40BQXz3G38; Fri, 22 Jul 2022 00:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658449680; 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=2H3XVTgkcus8FHN7AY3B72Y0Jt5YqQCrZz0omJ675xc=; b=ESKCXmrdiOdZDc7I2yrS6Bw2NkpmqIlJL7BS0oZSnXt8ZxT2mtN/TqR7FFZ7p2+VnkMgEh TW5MVjEN8whGSWuHCXCChrZFqc4ByUBRKiEP7+iz9D9doBWci3kNccvR64+YB3zmfaZOX3 hZ9G6sOHFJmQfDxTUxBCvBjwH6BktExoR5fF6kdFvmdtKrE61+hX3PuWdPtI4tMVIQp22+ cEJgJJNr3SMCfUBgOb/2vqEdXRWD4v7M39l1dDCLa7cPryZeSFlM3lSvvHcyg7dtZedTgf 0LHeFjmyw4zR/zKwES+ay1ZdPFxW3uvrd0mMH0PypFJT6rVI/NOUWCQEqqtG9g== 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 4Lpqz36KDwzhcv; Fri, 22 Jul 2022 00:27:59 +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 26M0RxFt076565; Fri, 22 Jul 2022 00:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26M0Rx3t076564; Fri, 22 Jul 2022 00:27:59 GMT (envelope-from git) Date: Fri, 22 Jul 2022 00:27:59 GMT Message-Id: <202207220027.26M0Rx3t076564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 34380bc26770 - stable/12 - rc.conf(5): Add _limits, _login_class, and _oomprotect 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: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 34380bc2677090a126e65b57512e220a8b06f660 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658449680; 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=2H3XVTgkcus8FHN7AY3B72Y0Jt5YqQCrZz0omJ675xc=; b=DbPgiOWs0IBWtNkqX/1A7OnKeKbfKCCwDsLIf+wEaFlsu4Rr/X5sM/r/bZ9JaqjlmVLD7A ml+aqdBhGinIk2i2Whc7SOpwXh9IbymqSDK6fOmWTiX2mWSEj/LhEB7Xdrd+2IodSFYEgh 5FD3tKjYmLtJPYOSdxu9Q98ZTQb6CgLyO8RK42CJZDtuUMJijeeULW39SVLOIZwAng1I73 HM8dJoGb1TuO8JC2HnrCJYE0/XuewoKlk5PDkfuuzsBv8obWbT1zOhIeLcTm/gy0//n/vK xoW21SIEoGnn6zdhTFLujrVNqKQ4K4lf35J2EvtDCSiUdhxY1WHZ9KCfNCW1pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658449680; a=rsa-sha256; cv=none; b=JdgWhsLoceML/Oh6ONEHqkATIwUa+gRNRIz353vV3SZlf2ZOmVdif3lUQJccFmiuQylFrO /B5BTIYQFZ6FVI35aoHURo5FT8/cNFN/INC9OXisCxldNw8idL50aguJv8TOhc6sWBmwVH 8MZNulW1vkPk07VhEwM2n4dgJ9EmtKw6oOVEmGY0DS4br16xrj3ZNNgXW80d2gsgyUWGUq Xv9c+wm619qQIAFFvoVZcp4dPpn2+bcUMj29OSRiSWDM/hLuUzvWMkh/EJcX4W+SEBJVYM nShGHsjOJtHjIv34SlKRNPPkuG0Smc7HPouUdzLD6Ekyw5YfXZ7Yz51HzT00oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=34380bc2677090a126e65b57512e220a8b06f660 commit 34380bc2677090a126e65b57512e220a8b06f660 Author: Daniel Ebdrup Jensen AuthorDate: 2021-05-18 12:46:41 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-22 00:19:40 +0000 rc.conf(5): Add _limits, _login_class, and _oomprotect Add a few very useful variables that might easily be overlooked, since they're only documented in rc.subr(8) which might not be the first place that people look. At least _oomprotect has existed since 11.0-RELEASE, and doesn't appear to be very well-known. While the others aren't as new, in my estimation, a lot more people would use them if they knew about them. While here, also add a reference to rc.subr(8) and login.conf(5), and sort the variables alphabetically. Reported by: Daniel Dettlaff Reviewed by: ceri, gbe, 0mp, ygy, a.wolk, pauamma (cherry picked from commit bd6dce978c1a4d4472c98ff5685de3c2f2bd0203) --- share/man/man5/rc.conf.5 | 49 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 060fcc5ed6e3..fcc8ee5a4a89 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -187,24 +187,53 @@ services are enabled that utilize the force_depend check. .Pq Vt str .Xr chroot 8 to this directory before running the service. -.It Ao Ar name Ac Ns Va _user -.Pq Vt str -Run the service under this user account. -.It Ao Ar name Ac Ns Va _group -.Pq Vt str -Run the chrooted service under this system group. -Unlike the _user -setting, this setting has no effect if the service is not chrooted. .It Ao Ar name Ac Ns Va _fib .Pq Vt int The .Xr setfib 1 value to run the service under. +.It Ao Ar name Ac Ns Va _group +.Pq Vt str +Run the chrooted service under this system group. +Unlike the +.Ao Ar name Ac Ns Va _user +setting, this setting has no effect if the service is not chrooted. +.It Ao Ar name Ac Ns Va _limits +.Pq Vt str +Resource limits to apply to the service using +.Xr limits 1 . +By default, resource limits are based on the login class defined in +.Ao Ar name Ac Ns Va _login_class . +.It Ao Ar name Ac Ns Va _login_class +.Pq Vt str +Login class to be used with +.Ao Ar name Ac Ns Va _limits . +Defaults to +.Dq Li daemon . .It Ao Ar name Ac Ns Va _nice .Pq Vt int The .Xr nice 1 value to run the service under. +.It Ao Ar name Ac Ns Va _oomprotect +Use +.Xr protect 1 +to prevent the service from being killed when swap space +is exhausted. +Use +.Dq Li YES +to protect only the service itself, and +.Dq Li ALL +to protect the service and all child processes. +.Pp +Please note rc scripts that redefine +.Bd +${name}_cmd +.Ed +such as PostgreSQL will not a inherit the OOM killer protection. +.It Ao Ar name Ac Ns Va _user +.Pq Vt str +Run the service under this user account. .It Va apm_enable .Pq Vt bool If set to @@ -4609,6 +4638,8 @@ files. .Xr gdb 1 , .Xr info 1 , .Xr kbdcontrol 1 , +.Xr limits 1 , +.Xr protect 1 , .Xr sh 1 , .Xr vi 1 , .Xr vidcontrol 1 , @@ -4630,6 +4661,7 @@ files. .Xr ipnat 5 , .Xr jail.conf 5 , .Xr loader.conf 5 , +.Xr login.conf 5 , .Xr motd 5 , .Xr newsyslog.conf 5 , .Xr pf.conf 5 , @@ -4676,6 +4708,7 @@ files. .Xr quotaon 8 , .Xr rc 8 , .Xr rc.sendmail 8 , +.Xr rc.subr 8 , .Xr rfcomm_pppd 8 , .Xr route 8 , .Xr routed 8 ,