Merge branch 'develop' into feld-2168-media-preview-proxy

1 files changed, 15 insertions, 16 deletions

diff --git a/installation/freebsd/rc.d/pleroma b/installation/freebsd/rc.d/pleroma
index 1e41e57e6..f62aef18d 100755
--- a/installation/freebsd/rc.d/pleroma
+++ b/installation/freebsd/rc.d/pleroma
@@ -1,28 +1,27 @@
 #!/bin/sh
-# REQUIRE: DAEMON postgresql
+# $FreeBSD$
 # PROVIDE: pleroma
+# REQUIRE: DAEMON postgresql
+# KEYWORD: shutdown
 
 # sudo -u pleroma MIX_ENV=prod elixir --erl \"-detached\" -S mix phx.server
 
 . /etc/rc.subr
 
-name="pleroma"
+name=pleroma
+rcvar=pleroma_enable
+
 desc="Pleroma Social Media Platform"
-rcvar=${name}_enable
-command="/usr/local/bin/elixir"
-command_args="--erl \"-detached\" -S /usr/local/bin/mix phx.server"
-pidfile="/dev/null"
 
-pleroma_user="pleroma"
-pleroma_home="/home/pleroma"
-pleroma_chdir="${pleroma_home}/pleroma"
-pleroma_env="HOME=${pleroma_home} MIX_ENV=prod"
+load_rc_config ${name}
 
-check_pidfile()
-{
-	pid=$(pgrep beam.smp$)
-	echo -n "${pid}"
-}
+: ${pleroma_user:=pleroma}
+: ${pleroma_home:=$(getent passwd ${pleroma_user} | awk -F: '{print $6}')}
+: ${pleroma_chdir:="${pleroma_home}/pleroma"}
+: ${pleroma_env:="HOME=${pleroma_home} MIX_ENV=prod"}
+
+command=/usr/local/bin/elixir
+command_args="--erl \"-detached\" -S /usr/local/bin/mix phx.server"
+procname="*beam.smp"
 
-load_rc_config ${name}
 run_rc_command "$1"