1 files changed, 11 insertions, 4 deletions
diff --git a/devel/athens/files/athens.in b/devel/athens/files/athens.in
index f9857d8fd2ef..7d1e07cf164c 100644
--- a/devel/athens/files/athens.in
+++ b/devel/athens/files/athens.in
@@ -25,20 +25,27 @@
 name=athens
 rcvar=athens_enable
 
+load_rc_config $name
+
 : ${athens_enable:="NO"}
 : ${athens_config:="%%ETCDIR%%/athens.toml"}
 : ${athens_user:=%%ATHENS_USER%%}
 : ${athens_group:=%%ATHENS_GROUP%%}
-: ${athens_pidfile:="/var/run/athens.pid"}
 
 athens_command="%%PREFIX%%/bin/athens -config_file ${athens_config}"
+pidfile="/var/run/${name}/${name}.pid"
 command="/usr/sbin/daemon"
-command_args="-p ${athens_pidfile} -u ${athens_user} -S ${athens_command}"
+command_args="-P ${pidfile} -S ${athens_command}"
 
 PATH="${PATH}:%%PREFIX%%/bin"
 
-load_rc_config $name
-
 required_files="${athens_config}"
 
+start_precmd="athens_precmd"
+
+athens_precmd()
+{
+  /usr/bin/install -d -m 700 -o "${athens_user}" -g "${athens_group}" /var/run/athens
+}
+
 run_rc_command "$1"