Re: [new] net/soju

There's a mixture of /etc and ${SYSCONFDIR} for the same dir, and some
use of VARBASE which isn't really quite right (should either be just
/var, or LOCALSTATEDIR, which is already in SUBST_VARS by default, as is
SYSCONFDIR). Here's one possible diff to fix.

diff --git net/soju/Makefile net/soju/Makefile
index e61d3ed..9dae3f9 100644
--- net/soju/Makefile
+++ net/soju/Makefile
@@ -18,7 +18,6 @@ BUILD_DEPENDS = textproc/scdoc
LIB_DEPENDS = databases/sqlite3

WRKDIST = ${WRKSRC}
-SUBST_VARS += SYSCONFDIR VARBASE

post-build:
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -C ${WRKSRC} ${MAKE_FLAGS} \
diff --git net/soju/pkg/PLIST net/soju/pkg/PLIST
index b8b9018..181dddb 100644
--- net/soju/pkg/PLIST
+++ net/soju/pkg/PLIST
@@ -1,5 +1,5 @@
@newgroup _soju:894
-@newuser _soju:894:_soju::soju user:${VARBASE}/soju:/sbin/nologin
+@newuser _soju:894:_soju::soju user:/var/soju:/sbin/nologin
@rcscript ${RCDIR}/soju
@bin bin/soju
@bin bin/sojuctl
@@ -15,4 +15,4 @@ share/examples/soju/
share/examples/soju/config
@sample ${SYSCONFDIR}/soju/config
@mode 755
-@sample ${VARBASE}/soju/
+@sample /var/soju/
diff --git net/soju/pkg/README net/soju/pkg/README
index af8d3c4..0574b02 100644
--- net/soju/pkg/README
+++ net/soju/pkg/README
@@ -2,15 +2,15 @@
| Running ${PKGSTEM} on OpenBSD
+-------------------------------------------------------------------------------

-Creating a databse
-==================
+Creating a database
+===================

Soju requires a database to be created before starting the daemon.
This can be done as follows:

$ doas -u _soju sojudb -config ${SYSCONFDIR}/soju/config create-user <username> -admin

-This will create the database under ${VARBASE}/soju/main.db or as specified
+This will create the database under /var/soju/main.db or as specified
in ${SYSCONFDIR}/soju/config.


@@ -26,4 +26,4 @@ listen ircs://
tls ${SYSCONFDIR}/ssl/example.com.fullchain.pem ${SYSCONFDIR}/ssl/private/example.com.key
...

-Note that both certificates should be readable to the _soju user.
+Note that certificate and key should be readable by the _soju user.
diff --git net/soju/pkg/soju.rc net/soju/pkg/soju.rc
index ce9ceba..3dd3fa4 100644
--- net/soju/pkg/soju.rc
+++ net/soju/pkg/soju.rc
@@ -1,7 +1,7 @@
#!/bin/ksh

daemon="${TRUEPREFIX}/bin/soju"
-daemon_flags="-config /etc/soju/config"
+daemon_flags="-config ${SYSCONFDIR}/soju/config"
daemon_logger=daemon.info
daemon_user=_soju


On 2023/11/27 19:43, Johannes Thyssen Tishman wrote:
> 2023-11-22T17:49:18Z "Johannes Thyssen Tishman" <lists@thyssentishman.com>:
>
> > please find attached a port for soju, an IRC bouncer.
> >
> > from pkg/DESCR:
> > > soju is a user-friendly IRC bouncer. soju connects to upstream IRC
> > > servers on behalf of the user to provide extra functionality. soju
> > > supports many features such as multiple users, numerous IRCv3
> > > extensions, chat history playback and detached channels. It is
> > > well-suited for both small and large deployments.
> >
> > soju is the IRC bouncer behind chat.sr.ht and AFAIK it is also
> > developed by the SourceHut project. It is really easy to configure
> > and I've been running it for a couple of days without any issues.
> >
> > Feedback, OKs?
> >
> > Kind regards,
> > Johannes
>
> A new release was made today. Please find the updated port attached.


> Index: infrastructure/db/user.list
> ===================================================================
> RCS file: /cvs/ports/infrastructure/db/user.list,v
> retrieving revision 1.433
> diff -u -p -r1.433 user.list
> --- infrastructure/db/user.list 27 Nov 2023 18:07:58 -0000 1.433
> +++ infrastructure/db/user.list 27 Nov 2023 19:33:30 -0000
> @@ -402,3 +402,4 @@ id user group port
> 891 _kiwix-serve _kiwix-serve www/kiwix/kiwix-tools
> 892 _shiori _shiori www/shiori
> 893 _azorius _azorius www/azorius
> +894 _soju _soju net/soju