--- ./Makefile 2018-02-21 15:49:21.000000000 +0800 +++ ./Makefile 2018-04-08 04:03:21.997713000 +0800 @@ -1,7 +1,7 @@ # $FreeBSD: head/sysutils/phpfpm_exporter/Makefile 462476 2018-02-21 07:49:21Z lwhsu $ PORTNAME= phpfpm_exporter -PORTVERSION= 0.3.3 +PORTVERSION= 0.4.1 DISTVERSIONPREFIX=v CATEGORIES= sysutils @@ -19,6 +19,8 @@ GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} PLIST_FILES= bin/${PORTNAME} USE_RC_SUBR= phpfpm_exporter +USERS= prometheus +GROUPS= prometheus do-build: @(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} CGO_ENABLED=0 ${GO_CMD} build -o ${PORTNAME} ./cmd/${GH_PROJECT}) --- ./distinfo 2018-02-21 15:49:21.000000000 +0800 +++ ./distinfo 2018-04-08 03:31:18.895159000 +0800 @@ -1,3 +1,3 @@ -TIMESTAMP = 1512723537 -SHA256 (bakins-php-fpm-exporter-v0.3.3_GH0.tar.gz) = 02b6ee16d3c595430dd875953639daa95e2b41e9f78e1aca45656e9f5e196b4c -SIZE (bakins-php-fpm-exporter-v0.3.3_GH0.tar.gz) = 1510300 +TIMESTAMP = 1523129478 +SHA256 (bakins-php-fpm-exporter-v0.4.1_GH0.tar.gz) = 1e35ac0254fd897d17d03063604b742405b655f090b79b32b821fe238ff97f4d +SIZE (bakins-php-fpm-exporter-v0.4.1_GH0.tar.gz) = 300772 --- ./files/phpfpm_exporter.in 2018-02-21 15:49:21.000000000 +0800 +++ ./files/phpfpm_exporter.in 2018-04-08 04:01:07.515826000 +0800 @@ -9,14 +9,16 @@ # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # -# phpfpm_exporter_enable (bool): Set to NO by default. +# phpfpm_exporter_enable (bool): Set to NO by default. # Set it to YES to enable phpfpm_exporter. -# phpfpm_exporter_user (string): Set user that phpfpm_exporter will run under -# Default is "nobody". -# phpfpm_exporter_group (string): Set group that phpfpm_exporter will run under -# Default is "nobody". +# phpfpm_exporter_user (string): Set user that phpfpm_exporter will run under +# Default is "prometheus". +# phpfpm_exporter_group (string): Set group that phpfpm_exporter will run under +# Default is "prometheus". # phpfpm_exporter_endpoint (string): Set status endpoint # Default is "http://127.0.0.1:9000/status". +# phpfpm_exporter_fastcgi (string): Set fastcgi url +# Default is "", If this is set, fastcgi will be used instead of HTTP. # phpfpm_exporter_listen_address (string): Set ip:port that phpfpm_exporter will listen on # Default is "127.0.0.1:8080". @@ -24,19 +26,20 @@ name=phpfpm_exporter rcvar=phpfpm_exporter_enable +desc="PHP-FPM prometheus exporter" load_rc_config $name -: ${phpfpm_exporter_enable:="NO"} -: ${phpfpm_exporter_user:="nobody"} -: ${phpfpm_exporter_group:="nobody"} -: ${phpfpm_exporter_endpoint:="http://127.0.0.1:9000/status"} -: ${phpfpm_exporter_listen_address:="127.0.0.1:8080"} +: ${phpfpm_exporter_enable:=NO} +: ${phpfpm_exporter_user:=prometheus} +: ${phpfpm_exporter_group:=prometheus} +: ${phpfpm_exporter_endpoint=http://127.0.0.1:9000/status} +: ${phpfpm_exporter_listen_address:=127.0.0.1:8080} pidfile=/var/run/phpfpm_exporter.pid -command="/usr/sbin/daemon" -procname="%%PREFIX%%/bin/phpfpm_exporter" +command=/usr/sbin/daemon +procname=%%PREFIX%%/bin/phpfpm_exporter command_args="-p ${pidfile} /usr/bin/env ${procname} \ --addr ${phpfpm_exporter_listen_address} \ --endpoint ${phpfpm_exporter_endpoint}" @@ -45,10 +48,15 @@ phpfpm_exporter_startprecmd() { - if [ ! -e ${pidfile} ]; then - install -o ${phpfpm_exporter_user} -g ${phpfpm_exporter_group} /dev/null ${pidfile}; - fi + if [ -n "$phpfpm_exporter_fastcgi" ]; then + command_args="$command_args --fastcgi $phpfpm_exporter_fastcgi" + fi + + if [ -e ${pidfile} ]; then + chown ${phpfpm_exporter_user}:${phpfpm_exporter_group} ${pidfile}; + else + install -o ${phpfpm_exporter_user} -g ${phpfpm_exporter_group} /dev/null ${pidfile}; + fi } -load_rc_config $name run_rc_command "$1"