logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://anongit.hacktivis.me/git/pleroma.git/
commit: 3b5b3ba4fc1e714c9d8927bb32f85d56e2f6b3d4
parent e0ba132bce735a5c429fa2280ce90d99fb02ae10
Author: Phantasm <phantasm@centrum.cz>
Date:   Wed, 27 Nov 2024 21:40:36 +0100

openbsd: properly set daemon workdir, use default rc_start, set MIX_ENV in login.conf

Setting the MIX_ENV variable in rc_pre() isn't possible, because the
environment doesn't persist between rc_pre and rc_start(). This way we
can also ditch the custom rc_start() function in favor of the default
one which is just:

rc_start() {
	rc_exec "${daemon} ${daemon_flags}
}

Diffstat:

Mdocs/installation/openbsd_en.md2+-
Minstallation/openbsd/rc.d/pleroma7+------
2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/docs/installation/openbsd_en.md b/docs/installation/openbsd_en.md @@ -69,7 +69,7 @@ pleroma:\ :datasize=1536M:\ :openfiles-max=4096:\ :openfiles-cur=1024:\ - :setenv=LC_ALL=en_US.UTF-8,VIX_COMPILATION_MODE=PLATFORM_PROVIDED_LIBVIPS:\ + :setenv=LC_ALL=en_US.UTF-8,VIX_COMPILATION_MODE=PLATFORM_PROVIDED_LIBVIPS,MIX_ENV=prod:\ :tc=daemon: ``` diff --git a/installation/openbsd/rc.d/pleroma b/installation/openbsd/rc.d/pleroma @@ -13,8 +13,7 @@ daemon="/usr/local/bin/elixir" daemon_flags="--erl \"-detached\" -S /usr/local/bin/mix phx.server" daemon_user="_pleroma" - -env="MIX_ENV=prod" +daemon_execdir="/home/_pleroma/pleroma" . /etc/rc.d/rc.subr @@ -25,10 +24,6 @@ rc_check() { pgrep -q -U _pleroma -f "phx.server" } -rc_start() { - rc_exec "cd pleroma; export ${env}; ${daemon} ${daemon_flags}" -} - rc_stop() { pkill -q -U _pleroma -f "phx.server" }