From owner-svn-ports-all@freebsd.org Sun May 20 09:24:11 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 218A0EAE8C3; Sun, 20 May 2018 09:24:11 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C7E41783C9; Sun, 20 May 2018 09:24:10 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A87BC1480D; Sun, 20 May 2018 09:24:10 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4K9OALD018083; Sun, 20 May 2018 09:24:10 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4K9OAqp018082; Sun, 20 May 2018 09:24:10 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201805200924.w4K9OAqp018082@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 20 May 2018 09:24:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470445 - in head/databases/mongodb32: . files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in head/databases/mongodb32: . files X-SVN-Commit-Revision: 470445 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 May 2018 09:24:11 -0000 Author: riggs Date: Sun May 20 09:24:10 2018 New Revision: 470445 URL: https://svnweb.freebsd.org/changeset/ports/470445 Log: Adapt ${name}_limits to the new resource limiting mechanics for services PR: 227218 Submitted by: 0mp Modified: head/databases/mongodb32/Makefile head/databases/mongodb32/files/mongod.in Modified: head/databases/mongodb32/Makefile ============================================================================== --- head/databases/mongodb32/Makefile Sun May 20 09:04:10 2018 (r470444) +++ head/databases/mongodb32/Makefile Sun May 20 09:24:10 2018 (r470445) @@ -3,7 +3,7 @@ PORTNAME= mongodb32 PORTVERSION= 3.2.11 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= r CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ @@ -50,6 +50,14 @@ USERS= mongodb GROUPS= mongodb USE_RC_SUBR= mongod + +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" +.else +SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " +.endif ALL_TARGET= core TEST_TARGET= unittests Modified: head/databases/mongodb32/files/mongod.in ============================================================================== --- head/databases/mongodb32/files/mongod.in Sun May 20 09:04:10 2018 (r470444) +++ head/databases/mongodb32/files/mongod.in Sun May 20 09:24:10 2018 (r470445) @@ -7,11 +7,11 @@ # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # -# mongod_enable (bool): Set to "NO" by default. +# mongod_enable (bool): Set to "NO" by default. # Set it to "YES" to enable mongod. -# mongod_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U mongodb` -# just before mongod starts. +%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb` +%%LEGACY_LIMITS%%# just before mongod starts. # mongod_dbpath (str): Default to "/var/db/mongodb" # Base database directory. # mongod_flags (str): Custom additional arguments to be passed to mongod. @@ -28,7 +28,7 @@ rcvar=mongod_enable load_rc_config $name : ${mongod_enable="NO"} -: ${mongod_limits="NO"} +%%LEGACY_LIMITS%%: ${mongod_limits="NO"} : ${mongod_dbpath="/var/db/mongodb"} : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend"} : ${mongod_user="mongodb"} @@ -52,11 +52,12 @@ mongod_prestart() if [ ! -d ${mongod_dbpath} ]; then mongod_create_dbpath || return 1 fi - if checkyesno mongod_limits; then - eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno mongod_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } run_rc_command "$1"