diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2018-06-10 02:41:46 +0800 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2018-06-10 02:41:46 +0800 |
| commit | 59bdff2a86269e1928f21d04fac7450d6ff49117 (patch) | |
| tree | 5c10d4dab55fb9de67190b7c7950d59371fdc4b8 | |
| parent | 8f9c91399253b5f129045ec586936ba5f4079588 (diff) | |
| download | freebsd-ports-gnome-59bdff2a86269e1928f21d04fac7450d6ff49117.tar.gz freebsd-ports-gnome-59bdff2a86269e1928f21d04fac7450d6ff49117.tar.zst freebsd-ports-gnome-59bdff2a86269e1928f21d04fac7450d6ff49117.zip | |
Adapt ${name}_limits to the new resource limiting mechanics for services
PR: 227219
Submitted by: 0mp
Approved by: maintainer timeout
| -rw-r--r-- | databases/arangodb32/Makefile | 9 | ||||
| -rw-r--r-- | databases/arangodb32/files/arangod.in | 21 |
2 files changed, 20 insertions, 10 deletions
diff --git a/databases/arangodb32/Makefile b/databases/arangodb32/Makefile index 5111dd7afde3..9ca727ac66d5 100644 --- a/databases/arangodb32/Makefile +++ b/databases/arangodb32/Makefile @@ -4,6 +4,7 @@ PORTNAME= arangodb DISTVERSIONPREFIX= v DISTVERSION= 3.2.13 +PORTREVISION= 1 CATEGORIES= databases net PKGNAMESUFFIX= 32 @@ -27,6 +28,14 @@ USERS= arangodb GROUPS= arangodb USE_RC_SUBR= arangod +.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 + post-install: .for section in 1 8 ${MV} ${STAGEDIR}${PREFIX}/share/man/man${section}/* ${STAGEDIR}${PREFIX}/man/man${section}/ diff --git a/databases/arangodb32/files/arangod.in b/databases/arangodb32/files/arangod.in index 4edc4bf9a59e..a71bc94b6f90 100644 --- a/databases/arangodb32/files/arangod.in +++ b/databases/arangodb32/files/arangod.in @@ -9,13 +9,13 @@ # # arangod_enable (bool): Set to "NO" by default. # Set it to "YES" to enable arangod. -# arangod_limits (bool): Set to "NO" by default. -# Set it to yes to run `limits -e -U arangodb` -# just before arangod starts. +%%LEGACY_LIMITS%%# arangod_limits (bool): Set to "NO" by default. +%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U arangodb` +%%LEGACY_LIMITS%%# just before arangod starts. # arangod_dbpath (str): Default to "/var/db/arangodb" # Base database directory. # arangod_logpath (str): Default to "/var/log/arangodb" -# Base logging directory +# Base logging directory # arangod_apppath (str): Default to "/var/db/arangodb-apps" # Base apps directory # arangod_flags (str): Custom additional arguments to be passed to arangod. @@ -32,7 +32,7 @@ rcvar=arangod_enable load_rc_config $name : ${arangod_enable="NO"} -: ${arangod_limits="NO"} +%%LEGACY_LIMITS%%: ${arangod_limits="NO"} : ${arangod_dbpath="/var/db/arangodb"} : ${arangod_logpath="/var/log/arangodb"} : ${arangod_apppath="/var/db/arangodb-apps"} @@ -75,11 +75,12 @@ arangod_prestart() if [ ! -d ${arangod_apppath} ]; then arangod_create_apppath || return 1 fi - if checkyesno arangod_limits; then - eval `/usr/bin/limits -e -U ${arangod_user}` 2>/dev/null - else - return 0 - fi +%%LEGACY_LIMITS%% if checkyesno arangod_limits; then +%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${arangod_user}` 2>/dev/null +%%LEGACY_LIMITS%% else +%%LEGACY_LIMITS%% return 0 +%%LEGACY_LIMITS%% fi +%%MODERN_LIMITS%% return 0 } run_rc_command "$1" |