Date: Tue, 18 Oct 2016 18:08:32 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424194 - in head/net-mgmt/prometheus: . files Message-ID: <201610181808.u9II8WXZ011186@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Tue Oct 18 18:08:32 2016 New Revision: 424194 URL: https://svnweb.freebsd.org/changeset/ports/424194 Log: sysutils/prometheus: Fix some issues discussed in PRs - the config file is now a @sample - pkg-plist added - /var/db/prometheus is the new place to be PR: 210059 Submitted by: Andy Carrel <wac@google.com> Approved by: jev@ecadlabs.com (maintainer) Added: head/net-mgmt/prometheus/pkg-plist (contents, props changed) Modified: head/net-mgmt/prometheus/Makefile head/net-mgmt/prometheus/files/prometheus.in Modified: head/net-mgmt/prometheus/Makefile ============================================================================== --- head/net-mgmt/prometheus/Makefile Tue Oct 18 18:04:28 2016 (r424193) +++ head/net-mgmt/prometheus/Makefile Tue Oct 18 18:08:32 2016 (r424194) @@ -3,6 +3,7 @@ PORTNAME= prometheus PORTVERSION= 1.2.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt @@ -16,10 +17,6 @@ USE_GITHUB= yes GO_PKGNAME= github.com/${PORTNAME}/${PORTNAME} -PLIST_FILES= bin/prometheus \ - bin/promtool \ - etc/prometheus.yml - USE_RC_SUBR= prometheus USERS= prometheus @@ -31,9 +28,12 @@ do-build: (cd ${GO_WRKSRC}/cmd/prometheus ; ${SETENV} ${GO_ENV} go install) (cd ${GO_WRKSRC}/cmd/promtool ; ${SETENV} ${GO_ENV} go install) +post-stage: + ${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/prometheus + do-install: ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/promtool ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml ${STAGEDIR}${LOCALBASE}/etc + ${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml ${STAGEDIR}${LOCALBASE}/etc/prometheus.yml.sample .include <bsd.port.mk> Modified: head/net-mgmt/prometheus/files/prometheus.in ============================================================================== --- head/net-mgmt/prometheus/files/prometheus.in Tue Oct 18 18:04:28 2016 (r424193) +++ head/net-mgmt/prometheus/files/prometheus.in Tue Oct 18 18:08:32 2016 (r424194) @@ -14,7 +14,7 @@ # prometheus_group (string): Set group to run prometheus # Default is "prometheus" # prometheus_data_dir (string): Set dir to run prometheus in -# Default is "/var/tmp/prometheus" +# Default is "/var/db/prometheus" # prometheus_log_file (string): Set file that prometheus will log to # Default is "/var/log/prometheus.log" # prometheus_args (string): Set additional command line arguments Added: head/net-mgmt/prometheus/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/prometheus/pkg-plist Tue Oct 18 18:08:32 2016 (r424194) @@ -0,0 +1,4 @@ +bin/prometheus +bin/promtool +@sample etc/prometheus.yml.sample +@dir(prometheus,prometheus) /var/db/prometheus
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610181808.u9II8WXZ011186>