1 files changed, 24 insertions, 6 deletions
diff --git a/devel/athens/files/athens.in b/devel/athens/files/athens.in
index 2c59b63c0f91..7d1e07cf164c 100644
--- a/devel/athens/files/athens.in
+++ b/devel/athens/files/athens.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # PROVIDE: athens
-# REQUIRE: networking
+# REQUIRE: LOGIN networking
 # KEYWORD: shutdown
 #
 # athens_enable (bool):
@@ -12,22 +12,40 @@
 #   Default value %%ETCDIR%%/athens.toml
 #   Path to the athens configuration file
 #
+# athens_user (string)
+#   This is the user that athens runs as
+#   Set to %%ATHENS_USER%% by default
+#
+# athens_group (string)
+#   This is the group that athens runs as
+#   Set to %%ATHENS_GROUP%% by default
 
 . /etc/rc.subr
 
+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%%}
 
-name=athens
-rcvar=athens_enable
 athens_command="%%PREFIX%%/bin/athens -config_file ${athens_config}"
+pidfile="/var/run/${name}/${name}.pid"
 command="/usr/sbin/daemon"
-command_args="-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"