svn commit: r468698 - in head/databases/mongodb34: . files

[Thomas Zander]

Author: riggs
Date: Mon Apr 30 13:17:51 2018
New Revision: 468698
URL: https://svnweb.freebsd.org/changeset/ports/468698

Log:
  Adapt mongod_limits to the new resource limiting mechanics for services
  
  PR:		227215
  Submitted by:	0mp
  Approved by:	eric at camachat.org (maintainer)

Modified:
  head/databases/mongodb34/Makefile
  head/databases/mongodb34/files/mongod.in

Modified: head/databases/mongodb34/Makefile
==============================================================================
--- head/databases/mongodb34/Makefile	Mon Apr 30 13:12:56 2018	(r468697)
+++ head/databases/mongodb34/Makefile	Mon Apr 30 13:17:51 2018	(r468698)
@@ -3,7 +3,7 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	3.4.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/ \
@@ -57,6 +57,14 @@ SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USES=	ssl
 SSL_MAKE_ARGS=	--ssl
+
+.include <bsd.port.options.mk>
+
+.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/mongodb34/files/mongod.in
==============================================================================
--- head/databases/mongodb34/files/mongod.in	Mon Apr 30 13:12:56 2018	(r468697)
+++ head/databases/mongodb34/files/mongod.in	Mon Apr 30 13:17:51 2018	(r468698)
@@ -9,9 +9,9 @@
 #
 # 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"}
@@ -51,11 +51,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"