unbreak fresh installations where defaults.ini would not be installed;

while here, instead of @sample'ing, directly install the file as it's not meant
to be edited anyway.
This commit is contained in:
jasper 2018-08-08 19:35:25 +00:00
parent 2349085205
commit fbaae3f747
2 changed files with 8 additions and 5 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2018/04/25 15:50:26 landry Exp $
# $OpenBSD: Makefile,v 1.5 2018/08/08 19:35:25 jasper Exp $
COMMENT = monitoring and metric analytics dashboards
GH_ACCOUNT = grafana
GH_PROJECT = grafana
GH_TAGNAME = v5.0.4
REVISION = 0
CATEGORIES = sysutils
@ -30,8 +31,11 @@ do-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/grafana-{server,cli} ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/grafana
${INSTALL_DATA} ${WRKSRC}/conf/*.{ini,toml} ${PREFIX}/share/examples/grafana
.for c in sample.ini ldap.toml
${INSTALL_DATA} ${WRKSRC}/conf/$c ${PREFIX}/share/examples/grafana
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/grafana/conf
${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${PREFIX}/share/grafana/conf/
cp -R ${WRKSRC}/public ${PREFIX}/share/grafana
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2018/04/25 15:50:26 landry Exp $
@comment $OpenBSD: PLIST,v 1.3 2018/08/08 19:35:25 jasper Exp $
@newgroup _grafana:798
@newuser _grafana:798:798:daemon:Grafana Daemon:/var/empty:/sbin/nologin
@bin bin/grafana-cli
@ -6,9 +6,8 @@
share/grafana/
share/grafana/conf/
share/examples/grafana/
share/grafana/conf/defaults.ini
@sample ${SYSCONFDIR}/grafana/
share/examples/grafana/defaults.ini
@sample share/grafana/conf/defaults.ini
share/examples/grafana/ldap.toml
@sample ${SYSCONFDIR}/grafana/ldap.toml
share/examples/grafana/sample.ini