diff --git www/minio/Makefile www/minio/Makefile index 330ff778ee8e..dff867000304 100644 --- www/minio/Makefile +++ www/minio/Makefile @@ -2,6 +2,7 @@ PORTNAME= minio PORTVERSION= ${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g} +PORTREVISION= 1 CATEGORIES= www DIST_SUBDIR= minio @@ -164,14 +165,20 @@ GO_BUILDFLAGS= -ldflags=' \ -X github.com/minio/minio/cmd.GOPATH=${WRKSRC} -s -w' PLIST_FILES= bin/${PORTNAME} -USE_RC_SUBR= minio +USE_RC_SUBR= ${PORTNAME} -USERS= minio -GROUPS= minio +MINIO_USER?= ${PORTNAME} +MINIO_GROUP?= ${PORTNAME} +MINIO_DBDIR?= /var/db/${PORTNAME} -SUB_LIST= GROUP="${GROUPS}" \ +USERS= ${MINIO_USER} +GROUPS= ${MINIO_GROUP} + +SUB_LIST= DBDIR=${MINIO_DBDIR} \ + GROUP="${GROUPS}" \ USER="${USERS}" + post-extract: @${RM} -r ${WRKSRC}/vendor/github.com/hashicorp/vault/sdk @${RLN} ${WRKSRC_hashicorp_vault_sdk}/sdk ${WRKSRC}/vendor/github.com/hashicorp/vault/sdk diff --git www/minio/files/minio.in www/minio/files/minio.in index 449ce85ad2fa..fab379470c9f 100644 --- www/minio/files/minio.in +++ www/minio/files/minio.in @@ -10,7 +10,7 @@ # Set it to "YES" to enable minio # minio_config (path): Set to "%%ETCDIR%%" by default # Set to directory to store minio config -# minio_certs (path): Set to "/var/tmp/minio" by default +# minio_certs (path): Set to "%%ETCDIR%%/certs" by default # Set to directory to certs dir # minio_disks (path): Set to "/var/db/minio" by default. # Set it to directory to store minio data @@ -41,15 +41,15 @@ load_rc_config ${name} : ${minio_enable:="NO"} : ${minio_config="%%ETCDIR%%"} -: ${minio_certs="/var/tmp/minio"} -: ${minio_disks="/var/db/minio"} +: ${minio_certs="%%ETCDIR%%/certs"} +: ${minio_disks="%%DBDIR%%"} : ${minio_address=":9000"} : ${minio_user:="%%USER%%"} : ${minio_group:="%%GROUP%%"} : ${minio_syslog_enable:="YES"} : ${minio_logfile:="/var/log/minio.log"} -start_precmd="minio_startprecmd" +start_precmd="minio_start_precmd" if checkyesno minio_syslog_enable; then if [ -n "${minio_syslog_output_tag}" ]; then @@ -72,7 +72,7 @@ procname="%%PREFIX%%/bin/minio" command="/usr/sbin/daemon" command_args="-f -t ${name} ${minio_syslog_output_flags} -p ${pidfile} /usr/bin/env ${minio_env} ${procname} -C \"${minio_config}\" -S \"${minio_certs}\" --quiet server --address=\"${minio_address}\" ${minio_disks} ${minio_args}" -minio_startprecmd() +minio_start_precmd() { if [ ! -e "${pidfile}" ]; then install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${pidfile}" @@ -81,15 +81,10 @@ minio_startprecmd() if [ ! -d "${minio_config}" ]; then install -d -o "${minio_user}" -g "${minio_group}" "${minio_config}" fi - if [ ! -e "${minio_logfile}" ]; then + + if ! checkyesno minio_syslog_enable && [ ! -e "${minio_logfile}" ]; then install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${minio_logfile}" fi - - for disk in "${minio_disks}"; do - if [ ! -d "${disk}" ]; then - install -d -o "${minio_user}" -g "${minio_group}" "${disk}" - fi - done } run_rc_command "$1"