Index: head/net-mgmt/ping_exporter/Makefile =================================================================== --- head/net-mgmt/ping_exporter/Makefile (revision 531014) +++ head/net-mgmt/ping_exporter/Makefile (revision 531015) @@ -1,33 +1,39 @@ # $FreeBSD$ PORTNAME= ping_exporter DISTVERSION= 0.44 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= jp+ports@supplntr.io COMMENT= Prometheus exporter for ICMP echo requests LICENSE= APACHE20 USES= go USE_GITHUB= yes GH_ACCOUNT= czerwonk GH_TUPLE= golang:net:83d349e8ac1a:golang_net/vendor/golang.org/x/net_83d349e8ac1a \ golang:sys:fead79001313:golang_sys/vendor/golang.org/x/sys_fead79001313 GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME} GO_TARGET= github.com/${GH_ACCOUNT}/${PORTNAME} USE_RC_SUBR= ping_exporter pre-build: ${RM} -r ${WRKSRC}/vendor/golang.org/x/net ${WRKSRC}/vendor/golang.org/x/sys ${MV} ${WRKSRC}/vendor/golang.org/x/net_83d349e8ac1a ${WRKSRC}/vendor/golang.org/x/net ${MV} ${WRKSRC}/vendor/golang.org/x/sys_fead79001313 ${WRKSRC}/vendor/golang.org/x/sys post-install: ${INSTALL_DATA} ${PATCHDIR}/ping_exporter.yml.sample \ ${STAGEDIR}${PREFIX}/etc/ping_exporter.yml.sample + ${MKDIR} ${STAGEDIR}${DATADIR}/syslog.d \ + ${STAGEDIR}${DATADIR}/newsyslog.conf.d + ${INSTALL_DATA} ${PATCHDIR}/ping_exporter.syslog \ + ${STAGEDIR}${DATADIR}/syslog.d/ping_exporter.conf + ${INSTALL_DATA} ${PATCHDIR}/ping_exporter.newsyslog \ + ${STAGEDIR}${DATADIR}/newsyslog.conf.d/ping_exporter.conf .include Index: head/net-mgmt/ping_exporter/files/ping_exporter.in =================================================================== --- head/net-mgmt/ping_exporter/files/ping_exporter.in (revision 531014) +++ head/net-mgmt/ping_exporter/files/ping_exporter.in (revision 531015) @@ -1,67 +1,60 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: ping_exporter # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # ping_exporter_enable (bool): Set to NO by default. # Set it to YES to enable ping_exporter. # ping_exporter_user (string): Set user that ping_exporter will run under # Default is "nobody". # ping_exporter_group (string): Set group that ping_exporter will run under # Default is "nobody". # ping_exporter_args (string): Set extra arguments to pass to ping_exporter # Default is "". # ping_exporter_listen_address (string):Set ip:port that ping_exporter will listen on # Default is "localhost:9427". # ping_exporter_config (string): Set configuration file of ping_exporter # Default is "%%PREFIX%%/etc/ping_exporter.yml". -# ping_exporter_log_file (string): Set log file of ping_exporter -# Default is "/var/log/ping_exporter.log". . /etc/rc.subr name=ping_exporter desc="Ping exporter for use with Prometheus" rcvar=ping_exporter_enable load_rc_config $name : ${ping_exporter_enable:=NO} : ${ping_exporter_user:=nobody} : ${ping_exporter_group:=nobody} : ${ping_exporter_listen_address=localhost:9427} : ${ping_exporter_config="%%PREFIX%%/etc/ping_exporter.yml"} -: ${ping_exporter_log_file=/var/log/ping_exporter.log} required_files="${ping_exporter_config}" pidfile=/var/run/ping_exporter.pid command=/usr/sbin/daemon procname="%%PREFIX%%/bin/ping_exporter" -command_args="-p ${pidfile} /usr/bin/env ${procname} \ +command_args="-p ${pidfile} -t ${name} -T ${name} -S \ + /usr/bin/env ${procname} \ -web.listen-address ${ping_exporter_listen_address} \ -config.path ${ping_exporter_config} \ - ${ping_exporter_args} >> ${ping_exporter_log_file} 2>&1" + ${ping_exporter_args} 2>&1" start_precmd=ping_exporter_startprecmd ping_exporter_startprecmd() { if [ ! -e ${pidfile} ]; then install -o ${ping_exporter_user} -g ${ping_exporter_group} /dev/null ${pidfile}; else chown ${ping_exporter_user}:${ping_exporter_group} ${pidfile}; - fi - if [ ! -e ${ping_exporter_log_file} ]; then - install -o ${ping_exporter_user} -g ${ping_exporter_group} -m 640 /dev/null ${ping_exporter_log_file}; - else - chown ${ping_exporter_user}:${ping_exporter_group} ${ping_exporter_log_file}; fi } run_rc_command "$1" Index: head/net-mgmt/ping_exporter/files/ping_exporter.newsyslog =================================================================== --- head/net-mgmt/ping_exporter/files/ping_exporter.newsyslog (nonexistent) +++ head/net-mgmt/ping_exporter/files/ping_exporter.newsyslog (revision 531015) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +/var/log/ping_exporter.log 644 7 1000 * J Property changes on: head/net-mgmt/ping_exporter/files/ping_exporter.newsyslog ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/ping_exporter/files/ping_exporter.syslog =================================================================== --- head/net-mgmt/ping_exporter/files/ping_exporter.syslog (nonexistent) +++ head/net-mgmt/ping_exporter/files/ping_exporter.syslog (revision 531015) @@ -0,0 +1,3 @@ +# $FreeBSD$ +!ping_exporter +*.* /var/log/ping_exporter.log Property changes on: head/net-mgmt/ping_exporter/files/ping_exporter.syslog ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/ping_exporter/files/pkg-message.in =================================================================== --- head/net-mgmt/ping_exporter/files/pkg-message.in (nonexistent) +++ head/net-mgmt/ping_exporter/files/pkg-message.in (revision 531015) @@ -0,0 +1,15 @@ +[ +{ type: install + message: <