On 2021/05/03 14:51, Denis Fondras wrote: > Le Mon, May 03, 2021 at 12:58:38PM +0100, Stuart Henderson a écrit : > > On 2021/05/03 13:50, Denis Fondras wrote: > > > (Bump to version 1.59 and remove zstd dependency) > > > > > > VictoriaMetrics is fast, cost-effective and scalable time-series database. > > > > > > https://victoriametrics.com/ > > > > Generally ports don't use capital letters in the port directory. > > There are a few which do use them but they're annoying.. > > > > ${INSTALL_PROGRAM} ./pkg/vmlogger.pl ${PREFIX}/bin/vmetricslogger.pl > > > > That should be in files/, and use ${INSTALL_SCRIPT} ${FILESDIR}/... > > I think it would be better to use the same name in the port dir as it's > > installed to. Do we really need the more complicated mechanism to map > > levels though? Other ports are using the daemon_logger scaffolding > > already in rc.subr. > > > > Thank you Stuart. Here is an updated version. > You are right, daemon_logger is enough.
Diff on top. VARBASE is always /var so there's no point subst'ing it, I think what's wanted here really is LOCALSTATEDIR. MAINTAINER = VictoriaMetrics <[email protected]> is that address going to end up at someone who knows something about OpenBSD? otherwise OK with me, though I wouldn't mind if someone who has a better relationship with golang ports than me also takes a look ;) diff 4b84e9e25d7eaded7c266f6afe6d2f9fe2a8b4d0 /usr/ports/mystuff blob - 9622ab8ee1eb294f62da4a6b19e1c312e710744f file + databases/victoriametrics/Makefile --- databases/victoriametrics/Makefile +++ databases/victoriametrics/Makefile @@ -24,7 +24,8 @@ USE_GMAKE = Yes MODULES = lang/go MODGO_GOPATH = ${MODGO_WORKSPACE} -SUBST_VARS = VARBASE +SUBST_VARS = LOCALSTATEDIR +NO_TEST = Yes do-build: cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} victoria-metrics-pure blob - f8c4222e7a1e84a6401609b415f8d4263b8695ed file + databases/victoriametrics/pkg/DESCR --- databases/victoriametrics/pkg/DESCR +++ databases/victoriametrics/pkg/DESCR @@ -1,2 +1,2 @@ -VictoriaMetrics is fast, cost-effective and scalable time-series +VictoriaMetrics is a fast, cost-effective and scalable time-series database. blob - 07a2fdea4515fbd51a31cb8d82dfc4e1c20422be file + databases/victoriametrics/pkg/PLIST --- databases/victoriametrics/pkg/PLIST +++ databases/victoriametrics/pkg/PLIST @@ -1,6 +1,6 @@ @comment $OpenBSD: PLIST,v$ @newgroup _vmetrics:866 -@newuser _vmetrics:866:_vmetrics:daemon:VictoriaMetrics:${VARBASE}/db/vmetrics:/sbin/nologin +@newuser _vmetrics:866:_vmetrics:daemon:VictoriaMetrics:${LOCALSTATEDIR}/db/vmetrics:/sbin/nologin @sample ${SYSCONFDIR}/prometheus/ @rcscript ${RCDIR}/vmetrics @bin bin/vmagent @@ -45,4 +45,4 @@ share/doc/vmetrics/vmrestore.md @mode 0755 @owner _vmetrics @group _vmetrics -@sample ${VARBASE}/db/vmetrics/ +@sample ${LOCALSTATEDIR}/db/vmetrics/ blob - 53894351221fb280f59bd2006085d165e5769ca9 file + databases/victoriametrics/pkg/vmetrics.rc --- databases/victoriametrics/pkg/vmetrics.rc +++ databases/victoriametrics/pkg/vmetrics.rc @@ -3,7 +3,7 @@ # $OpenBSD$ daemon="${TRUEPREFIX}/bin/vmetrics" -daemon_flags="-storageDataPath=/var/db/vmetrics/ ${daemon_flags}" +daemon_flags="-storageDataPath=${LOCALSTATEDIR}/db/vmetrics/ ${daemon_flags}" daemon_user="_vmetrics" daemon_logger="daemon.info" @@ -12,6 +12,4 @@ daemon_logger="daemon.info" rc_bg=YES rc_reload=NO -me=`basename $0` - rc_cmd $1
