diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile index 1520087c287a..0f9492e463f8 100644 --- a/databases/influxdb/Makefile +++ b/databases/influxdb/Makefile @@ -1,80 +1,81 @@ PORTNAME= influxdb DISTVERSIONPREFIX= v DISTVERSION= 1.8.10 +PORTREVISION= 1 CATEGORIES= databases net-mgmt MAINTAINER= driesm@FreeBSD.org COMMENT= Open-source distributed time series database LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe go:modules CPE_VENDOR= influxdata USE_RC_SUBR= influxd GO_MODULE= github.com/influxdata/influxdb GO_TARGET= ./cmd/influx ./cmd/influx_inspect ./cmd/influx_stress \ ./cmd/influxd GO_BUILDFLAGS= -ldflags "-X main.version=${DISTVERSION}" SUB_LIST= INFLUXD_DBDIR=${INFLUXD_DBDIR} \ INFLUXD_GROUP=${INFLUXD_GROUP} \ INFLUXD_LOGDIR=${INFLUXD_LOGDIR} \ INFLUXD_PIDDIR=${INFLUXD_PIDDIR} \ INFLUXD_USER=${INFLUXD_USER} USERS= ${INFLUXD_USER} GROUPS= ${INFLUXD_GROUP} PLIST_SUB= INFLUXD_DBDIR=${INFLUXD_DBDIR} \ INFLUXD_GROUP=${INFLUXD_GROUP} \ INFLUXD_LOGDIR=${INFLUXD_LOGDIR} \ INFLUXD_PIDDIR=${INFLUXD_PIDDIR} \ INFLUXD_USER=${INFLUXD_USER} OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT= MANPAGES OPTIONS_SUB= yes MANPAGES_USES= gmake MANPAGES_BUILD_DEPENDS= asciidoc:textproc/asciidoc \ docbook-xml>0:textproc/docbook-xml \ xmlto:textproc/xmlto INFLUXD_DBDIR= /var/db/${PORTNAME}/ INFLUXD_LOGDIR= /var/log/${PORTNAME}/ INFLUXD_PIDDIR= /var/run/${PORTNAME}/ INFLUXD_USER= influxd INFLUXD_GROUP= influxd .include .if ${OPSYS} == "FreeBSD" SUB_LIST+= INFLUXD_LOGCMD="daemon" .else SUB_LIST+= INFLUXD_LOGCMD="logger" .endif do-build-MANPAGES-on: @cd ${WRKSRC}/man && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} do-install-MANPAGES-on: ${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 post-install: ${MKDIR} ${STAGEDIR}${INFLUXD_DBDIR} \ ${STAGEDIR}${INFLUXD_PIDDIR} \ ${STAGEDIR}${INFLUXD_LOGDIR} @${SED} -i .bak -e \ "s|/var/lib/influxdb|/var/db/influxdb|g" \ ${WRKSRC}/etc/config.sample.toml ${INSTALL_DATA} \ ${WRKSRC}/etc/config.sample.toml \ ${STAGEDIR}${PREFIX}/etc/influxd.conf.sample .include diff --git a/databases/influxdb/files/influxd.in b/databases/influxdb/files/influxd.in index 57c3892f1cff..539daf16d49c 100644 --- a/databases/influxdb/files/influxd.in +++ b/databases/influxdb/files/influxd.in @@ -1,67 +1,67 @@ #!/bin/sh # PROVIDE: influxd # REQUIRE: DAEMON NETWORKING # BEFORE: LOGIN # KEYWORD: shutdown # Add the following lines to /etc/rc.conf to enable influxdb: # influxd_enable="YES" # # influxd_enable (bool): Set to YES to enable influxd # Default: NO # influxd_conf (str): influxd configuration file # Default: ${PREFIX}/etc/influxd.conf # influxd_user (str): influxd daemon user # Default: influxd # influxd_group (str): influxd daemon group # Default: influxd # influxd_flags (str): Extra flags passed to influxd # # influxd_facility (str): Syslog facility to use # Default: daemon # influxd_priority (str): Syslog priority to use # Default: info . /etc/rc.subr name="influxd" rcvar=influxd_enable load_rc_config $name : ${influxd_enable:="NO"} : ${influxd_user:="%%INFLUXD_USER%%"} : ${influxd_group:="%%INFLUXD_GROUP%%"} : ${influxd_flags:=""} : ${influxd_facility:="daemon"} : ${influxd_priority:="info"} : ${influxd_conf:="%%PREFIX%%/etc/${name}.conf"} : ${influxd_options:="${influxd_flags} -config=${influxd_conf}"} # daemon influxd_pidfile="%%INFLUXD_PIDDIR%%${name}.pid" procname="%%PREFIX%%/bin/${name}" command=/usr/sbin/daemon start_precmd="influxd_precmd" -start_cmd="influxd_startcmd_%%INFLUXD_LOGCMD%%" +start_cmd="influxd_startcmd_%%INFLUXD_LOGCMD%%" influxd_precmd() { install -d -o ${influxd_user} %%INFLUXD_PIDDIR%% } influxd_startcmd_daemon() { - echo "Starting ${name}." - /usr/sbin/daemon -c -p ${influxd_pidfile} -S -s ${influxd_priority} -l ${influxd_facility} \ - -u ${influxd_user} ${procname} ${influxd_options} + echo "Starting ${name}." + /usr/sbin/daemon -c -p ${influxd_pidfile} -S -s ${influxd_priority} -l ${influxd_facility} -T ${name} \ + -u ${influxd_user} ${procname} ${influxd_options} } -influxd_startcmd_logger() +influxd_startcmd_logger() { - echo "Starting ${name}." + echo "Starting ${name}." /usr/sbin/daemon -c -p ${influxd_pidfile} -u ${influxd_user} /bin/sh -c "${procname} ${influxd_options} 2>&1 \ | /usr/bin/logger -t ${name} -p ${influxd_facility}.${influxd_priority}" -} +} run_rc_command "$1"