Attachment 220615 Details for Bug 251889 – www/minio patch

[patch] www/minio patch

minio.diff (text/plain), 4.23 KB, created by Boris Korzun on 2020-12-16 11:25:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Korzun

Created: 2020-12-16 11:25:17 UTC

Size: 4.23 KB

patch

obsolete

>Index: www/minio/Makefile
>===================================================================
>--- www/minio/Makefile	(revision 558175)
>+++ www/minio/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	minio
> PORTVERSION=	${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g}
>+PORTREVISION=	1
> CATEGORIES=	www
> DIST_SUBDIR=	minio
> 
>Index: www/minio/files/minio.in
>===================================================================
>--- www/minio/files/minio.in	(revision 558175)
>+++ www/minio/files/minio.in	(working copy)
>@@ -9,7 +9,7 @@
> # minio_enable (bool):          Set to "NO" by default.
> #                               Set it to "YES" to enable minio
> # minio_config (path):          Set to "%%ETCDIR%%" by default
>-#                               Set to directory to store minio config
>+#                               Set to directory to store minio config (deprecated)
> # 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.
>@@ -40,7 +40,6 @@
> load_rc_config ${name}
> 
> : ${minio_enable:="NO"}
>-: ${minio_config="%%ETCDIR%%"}
> : ${minio_certs="%%ETCDIR%%/certs"}
> : ${minio_disks="%%DBDIR%%"}
> : ${minio_address=":9000"}
>@@ -52,43 +51,52 @@
> start_precmd="minio_start_precmd"
> 
> if checkyesno minio_syslog_enable; then
>-    if [ -n "${minio_syslog_output_tag}" ]; then
>-        minio_syslog_output_flags="-T ${minio_syslog_output_tag}"
>-    else
>-        minio_syslog_output_flags="-T ${name}"
>-    fi
>-    if [ -n "${minio_syslog_priority}" ]; then
>-        minio_syslog_output_flags="${minio_syslog_output_flags} -s ${minio_syslog_priority}"
>-    fi
>-    if [ -n "${minio_syslog_facility}" ]; then
>-        minio_syslog_output_flags="${minio_syslog_output_flags} -l ${minio_syslog_facility}"
>-    fi
>+	if [ -n "${minio_syslog_output_tag}" ]; then
>+		minio_syslog_output_flags="-T ${minio_syslog_output_tag}"
>+	else
>+		minio_syslog_output_flags="-T ${name}"
>+	fi
>+	if [ -n "${minio_syslog_priority}" ]; then
>+		minio_syslog_output_flags="${minio_syslog_output_flags} -s ${minio_syslog_priority}"
>+	fi
>+	if [ -n "${minio_syslog_facility}" ]; then
>+		minio_syslog_output_flags="${minio_syslog_output_flags} -l ${minio_syslog_facility}"
>+	fi
> else
>-    minio_syslog_output_flags="-o ${minio_logfile}"
>+	minio_syslog_output_flags="-o ${minio_logfile}"
> fi
> 
>+# legacy compatibility
>+if [ -n "${minio_config" ]; then
>+	minio_config_flag="-C \"${minio_config}\""
>+fi
>+
> pidfile="/var/run/${name}.pid"
> 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}"
>+command_args="-f -t ${name} ${minio_syslog_output_flags} -p ${pidfile} /usr/bin/env ${minio_env} ${procname} ${minio_config_flag} -S \"${minio_certs}\" --quiet server --address=\"${minio_address}\" ${minio_disks} ${minio_args}"
> 
> minio_start_precmd()
> {
>-    if [ ! -e "${pidfile}" ]; then
>-        install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${pidfile}"
>-    fi
>+	if [ ! -e "${pidfile}" ]; then
>+		install -m 0600 -o "${minio_user}" -g "${minio_group}" /dev/null "${pidfile}"
>+	fi
> 
>-    if [ ! -d "${minio_disks}" ]; then
>-        install -d -o "${minio_user}" -g "${minio_group}" "${minio_disks}"
>-    fi
>+	if echo "${minio_disks}" | egrep -q -v '^[^/]|\.{3}'; then
>+		for disk in "${minio_disks}"; do
>+			if [ ! -d "${disk}" ]; then
>+				install -d -m 0750 -o "${minio_user}" -g "${minio_group}" "${disk}"
>+			fi
>+		done
>+	fi
> 
>-    if [ ! -d "${minio_config}" ]; then
>-        install -d -o "${minio_user}" -g "${minio_group}" "${minio_config}"
>-    fi
>+	if [ -n "${minio_config}" -a ! -d "${minio_config}" ]; then
>+		install -d -m 0750 -o "${minio_user}" -g "${minio_group}" "${minio_config}"
>+	fi
> 
>-    if ! checkyesno minio_syslog_enable && [ ! -e "${minio_logfile}" ]; then
>-        install -o "${minio_user}" -g "${minio_group}" "/dev/null" "${minio_logfile}"
>-    fi
>+	if ! checkyesno minio_syslog_enable && [ ! -e "${minio_logfile}" ]; then
>+		install -m 0640 -o "${minio_user}" -g "${minio_group}" /dev/null "${minio_logfile}"
>+	fi
> }
> 
> run_rc_command "$1"

Actions: View | Diff

Attachments on bug 251889: 220615 | 220664