Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Jan 2017 15:48:47 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r430479 - head/sysutils/munin-node
Message-ID:  <201701031548.v03FmlHG059722@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Tue Jan  3 15:48:47 2017
New Revision: 430479
URL: https://svnweb.freebsd.org/changeset/ports/430479

Log:
  Fix plugin configurations.
  
  Munin seems to read all the files in its .d directory, so the .sample is
  always read after the actual .conf, and overwrites its defaults.
  Which is, obviously, a bad thing.
  
  Sponsored by:	Absolight

Modified:
  head/sysutils/munin-node/Makefile   (contents, props changed)
  head/sysutils/munin-node/pkg-plist   (contents, props changed)

Modified: head/sysutils/munin-node/Makefile
==============================================================================
--- head/sysutils/munin-node/Makefile	Tue Jan  3 15:20:02 2017	(r430478)
+++ head/sysutils/munin-node/Makefile	Tue Jan  3 15:48:47 2017	(r430479)
@@ -3,7 +3,7 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node
@@ -77,7 +77,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf \
 		${STAGEDIR}${ETCDIR}/munin-node.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/plugins.conf \
-		${STAGEDIR}${ETCDIR}/plugin-conf.d/plugins.conf.sample
+		${STAGEDIR}${ETCDIR}/plugins.conf.sample
 	(cd ${WRKSRC}/node/blib/bindoc; \
 		${INSTALL_MAN} munin-node-configure.1 munin-node.1 munin-run.1 munin-sched.1 munindoc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1; \
 	)

Modified: head/sysutils/munin-node/pkg-plist
==============================================================================
--- head/sysutils/munin-node/pkg-plist	Tue Jan  3 15:20:02 2017	(r430478)
+++ head/sysutils/munin-node/pkg-plist	Tue Jan  3 15:48:47 2017	(r430479)
@@ -1,6 +1,7 @@
 bin/munindoc
 @sample %%ETCDIR%%/munin-node.conf.sample
-@sample %%ETCDIR%%/plugin-conf.d/plugins.conf.sample
+@dir %%ETCDIR%%/plugin-conf.d
+@sample %%ETCDIR%%/plugins.conf.sample %%ETCDIR%%/plugin-conf.d/plugins.conf
 @comment the directory exists in STAGEDIR because it is present in
 @comment BSD.local.dist but if not registered here, it will not exist in PREFIX
 @comment when the package is installed.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701031548.v03FmlHG059722>