Install the example collectd.conf with 644 mode, and use @mode 640 for

the @sample version.
This commit is contained in:
landry 2014-01-24 20:40:17 +00:00
parent a0ca64b1a8
commit 5737d43f49
3 changed files with 7 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2013/11/06 20:45:48 kili Exp $
# $OpenBSD: Makefile,v 1.21 2014/01/24 20:40:17 landry Exp $
COMMENT-main = system metrics collection engine
COMMENT-mysql = collectd mysql plugin
@ -15,7 +15,7 @@ PKGNAME-rrdtool = collectd-rrdtool-$V
PKGNAME-snmp = collectd-snmp-$V
CATEGORIES = sysutils
REVISION-main= 3
REVISION-main= 4
REVISION-mysql = 3
REVISION-pgsql = 2
REVISION-rrdtool = 2

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2012/09/23 19:33:02 jasper Exp $
$OpenBSD: patch-src_Makefile_in,v 1.5 2014/01/24 20:40:17 landry Exp $
Install config file in examples/
--- src/Makefile.in.orig Sat Nov 27 11:10:51 2010
+++ src/Makefile.in Sun Sep 23 21:17:24 2012
@ -55,7 +55,7 @@ Install config file in examples/
- $(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
- fi; \
+ $(mkinstalldirs) ${PREFIX}/share/examples
+ $(INSTALL) -m 0640 collectd.conf ${PREFIX}/share/examples/collectd.conf; \
+ $(INSTALL) -m 0644 collectd.conf ${PREFIX}/share/examples/collectd.conf; \
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2010/11/29 20:20:41 jasper Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2014/01/24 20:40:17 landry Exp $
@newgroup _collectd:652
@newuser _collectd:652:652:daemon:Collectd Daemon:/var/empty:/sbin/nologin
@bin bin/collectd-nagios
@ -128,7 +128,9 @@ share/collectd/
share/collectd/postgresql_default.conf
share/collectd/types.db
share/examples/collectd.conf
@mode 640
@sample ${SYSCONFDIR}/collectd.conf
@mode
@owner _collectd
@group _collectd
@sample /var/collectd/