diff options
| author | swills <swills@FreeBSD.org> | 2018-10-31 09:44:04 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2018-10-31 09:44:04 +0800 |
| commit | 824504f0fe4dc415e0b2cb4642ce2fd67121586b (patch) | |
| tree | 337621ac057269d147b68c15e5d2eee59315a526 | |
| parent | c23f8c481f1fdc256aeb0163e0359a47ff35a22a (diff) | |
| download | freebsd-ports-gnome-824504f0fe4dc415e0b2cb4642ce2fd67121586b.tar.gz freebsd-ports-gnome-824504f0fe4dc415e0b2cb4642ce2fd67121586b.tar.zst freebsd-ports-gnome-824504f0fe4dc415e0b2cb4642ce2fd67121586b.zip | |
net-mgmt/prometheus2: Remove syslog and newsyslog config files
While here, pet portlint
PR: 232813
Submitted by: David O'Rourke <dor.bsd@xm0.uk> (maintainer)
| -rw-r--r-- | net-mgmt/prometheus2/Makefile | 20 | ||||
| -rw-r--r-- | net-mgmt/prometheus2/files/newsyslog.conf.in | 6 | ||||
| -rw-r--r-- | net-mgmt/prometheus2/files/syslog.d.conf.in | 5 | ||||
| -rw-r--r-- | net-mgmt/prometheus2/pkg-plist | 2 |
4 files changed, 3 insertions, 30 deletions
diff --git a/net-mgmt/prometheus2/Makefile b/net-mgmt/prometheus2/Makefile index 3549757c4e0c..3dc45e54d467 100644 --- a/net-mgmt/prometheus2/Makefile +++ b/net-mgmt/prometheus2/Makefile @@ -3,6 +3,7 @@ PORTNAME= prometheus DISTVERSIONPREFIX= v DISTVERSION= 2.4.3 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= dor.bsd@xm0.uk @@ -12,14 +13,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go gmake -GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} USE_GITHUB= yes USE_RC_SUBR= prometheus -OPTIONS_DEFINE= USE_SYSLOG -OPTIONS_DEFAULT= USE_SYSLOG -USE_SYSLOG_DESC= Install configuration files for syslog and newsyslog -OPTIONS_SUB= yes +GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} PROMETHEUS_USER?= prometheus PROMETHEUS_GROUP?= prometheus @@ -35,9 +32,7 @@ PROMETHEUS_DB_DIR= /var/db/${PORTNAME} PROMETHEUS_LOG_DIR= /var/log/prometheus PROMETHEUS_LOG_FILE= ${PROMETHEUS_LOG_DIR}/prometheus.log -SUB_FILES= prometheus \ - newsyslog.conf \ - syslog.d.conf +SUB_FILES= prometheus SUB_LIST+= PROMETHEUS_USER=${PROMETHEUS_USER} \ PROMETHEUS_GROUP=${PROMETHEUS_GROUP} \ @@ -88,13 +83,4 @@ do-install: && ${COPYTREE_SHARE} . ${STAGEDIR}${PROMETHEUS_CONSOLES_DIR} \ ) -post-install-USE_SYSLOG-on: - @${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} \ - ${WRKDIR}/syslog.d.conf \ - ${STAGEDIR}${ETCDIR}/syslog.d.conf.sample - ${INSTALL_DATA} \ - ${WRKDIR}/newsyslog.conf \ - ${STAGEDIR}${ETCDIR}/newsyslog.conf.sample - .include <bsd.port.mk> diff --git a/net-mgmt/prometheus2/files/newsyslog.conf.in b/net-mgmt/prometheus2/files/newsyslog.conf.in deleted file mode 100644 index 997171f5e8cd..000000000000 --- a/net-mgmt/prometheus2/files/newsyslog.conf.in +++ /dev/null @@ -1,6 +0,0 @@ -# newsyslog(8) file for net-mgmt/prometheus2 -# See newsyslog.conf(5) for details. -# -# Log file will be rotated daily, and we'll keep 15 days of logs matching the -# default Prometheus TSDB retention time. -%%PROMETHEUS_LOG_FILE%% 640 15 * @T00 JC diff --git a/net-mgmt/prometheus2/files/syslog.d.conf.in b/net-mgmt/prometheus2/files/syslog.d.conf.in deleted file mode 100644 index 36f10d3c31bc..000000000000 --- a/net-mgmt/prometheus2/files/syslog.d.conf.in +++ /dev/null @@ -1,5 +0,0 @@ -# syslogd(8) configuration file for net-mgmt/prometheus2 -# -# See syslog.conf(5) for details. -!prometheus -daemon.* %%PROMETHEUS_LOG_FILE%% diff --git a/net-mgmt/prometheus2/pkg-plist b/net-mgmt/prometheus2/pkg-plist index a82f590dd9d8..9ad268d041aa 100644 --- a/net-mgmt/prometheus2/pkg-plist +++ b/net-mgmt/prometheus2/pkg-plist @@ -1,7 +1,5 @@ bin/prometheus bin/promtool -%%USE_SYSLOG%%@sample %%ETCDIR%%/newsyslog.conf.sample /etc/newsyslog.conf.d/%%PORTNAME%%.conf -%%USE_SYSLOG%%@sample %%ETCDIR%%/syslog.d.conf.sample /etc/syslog.d/%%PORTNAME%%.conf %%PROMETHEUS_CONSOLE_LIBRARIES_DIR%%/menu.lib %%PROMETHEUS_CONSOLE_LIBRARIES_DIR%%/prom.lib %%PROMETHEUS_CONSOLES_DIR%%/index.html.example |