Attachment 190488 Details for Bug 225809 – net-mgmt/blackbox_exporter: rc script fixes

[patch] net-mgmt/blackbox_exporter: rc script fixes

blackbox_exporter-fixes.diff (text/plain), 2.43 KB, created by David O'Rourke on 2018-02-10 20:06:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David O'Rourke

Created: 2018-02-10 20:06:16 UTC

Size: 2.43 KB

patch

obsolete

>diff --git a/net-mgmt/blackbox_exporter/Makefile b/net-mgmt/blackbox_exporter/Makefile
>index abcaf78098b2..366a8a0b2ef1 100644
>--- a/net-mgmt/blackbox_exporter/Makefile
>+++ b/net-mgmt/blackbox_exporter/Makefile
>@@ -3,13 +3,15 @@
> 
> PORTNAME=	blackbox_exporter
> PORTVERSION=	0.11.0
>+PORTREVISION=	1
> DISTVERSIONPREFIX=v
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	bsam@FreeBSD.org
> COMMENT=	Prometheus exporter for endpoints over HTTP(S), DNS, TCP and ICMP
> 
>-LICENSE=	APACHE20
>+LICENSE=		APACHE20
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> USES=		go
> USE_GITHUB=	yes
>diff --git a/net-mgmt/blackbox_exporter/files/blackbox_exporter.in b/net-mgmt/blackbox_exporter/files/blackbox_exporter.in
>index 4de0a9234bac..c6a49462fe9a 100644
>--- a/net-mgmt/blackbox_exporter/files/blackbox_exporter.in
>+++ b/net-mgmt/blackbox_exporter/files/blackbox_exporter.in
>@@ -19,6 +19,8 @@
> #               Default is ":9115".
> # blackbox_exporter_config (string):        Set configuration file of blackbox_exporter
> #               Default is "%%PREFIX%%/etc/blackbox_exporter.yml".
>+# blackbox_exporter_log_file (string):      Set log file of blackbox_exporter
>+#               Default is "/var/log/blackbox_exporter.log".
> 
> . /etc/rc.subr
> 
>@@ -33,6 +35,7 @@ load_rc_config $name
> : ${blackbox_exporter_args:=""}
> : ${blackbox_exporter_listen_address:=":9115"}
> : ${blackbox_exporter_config:="%%PREFIX%%/etc/blackbox_exporter.yml"}
>+: ${blackbox_exporter_log_file:="/var/log/blackbox_exporter.log"}
> 
> pidfile=/var/run/blackbox_exporter.pid
> command="/usr/sbin/daemon"
>@@ -40,14 +43,24 @@ procname="%%PREFIX%%/bin/blackbox_exporter"
> command_args="-p ${pidfile} /usr/bin/env ${procname} \
>     --web.listen-address=${blackbox_exporter_listen_address} \
>     --config.file=${blackbox_exporter_config} \
>-    ${blackbox_exporter_args}"
>+    ${blackbox_exporter_args} >> ${blackbox_exporter_log_file} 2>&1"
> 
> start_precmd=blackbox_exporter_startprecmd
> 
> blackbox_exporter_startprecmd()
> {
>     if [ ! -e ${pidfile} ]; then
>-        install -o ${blackbox_exporter_user} -g ${blackbox_exporter_group} /dev/null ${pidfile};
>+        install \
>+            -o ${blackbox_exporter_user} \
>+            -g ${blackbox_exporter_group} \
>+            /dev/null ${pidfile};
>+    fi
>+    if [ ! -e ${blackbox_exporter_log_file} ]; then
>+        install \
>+            -o ${blackbox_exporter_user} \
>+            -g ${blackbox_exporter_group} \
>+            -m 640 \
>+            /dev/null ${blackbox_exporter_log_file};
>     fi
> }
>

Actions: View | Diff

Attachments on bug 225809: 190488