3 files changed, 5 insertions, 36 deletions

diff --git a/mail/rspamd-devel/files/rspamd.in b/mail/rspamd-devel/files/rspamd.in
index a594f0bda034..b605115cb77e 100644
--- a/mail/rspamd-devel/files/rspamd.in
+++ b/mail/rspamd-devel/files/rspamd.in
@@ -12,9 +12,9 @@
 # rspamd_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable rspamd.
 #
-# rspamd_user (str):		Default to "nobody".
+# rspamd_user (str):		Default to "rspamd".
 #
-# rspamd_group (str):		Default to "nobody".
+# rspamd_group (str):		Default to "rspamd".
 #
 # rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.conf".
 
@@ -26,8 +26,8 @@ rcvar=rspamd_enable
 load_rc_config $name
 
 : ${rspamd_enable:="NO"}
-: ${rspamd_user="nobody"}
-: ${rspamd_group="nobody"}
+: ${rspamd_user="rspamd"}
+: ${rspamd_group="rspamd"}
 : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"}
 
 pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"}
diff --git a/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in b/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
index de693aabf0d1..3b5933cebbf3 100644
--- a/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
+++ b/mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
@@ -8,4 +8,4 @@
 # See newsyslog.conf(5) for details.
 #
 # logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
-/var/log/rspamd/rspamd.log	nobody:nobody	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
+/var/log/rspamd/rspamd.log	rspamd:rspamd	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
diff --git a/mail/rspamd-devel/files/rspamd_redirector.in b/mail/rspamd-devel/files/rspamd_redirector.in
deleted file mode 100644
index d719ee240af0..000000000000
--- a/mail/rspamd-devel/files/rspamd_redirector.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: rspamd_redirector
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable rspamd_redirector:
-#
-# rspamd_redirector_enable (bool):	Set to "NO" by default.
-# 					Set it to "YES" to enable redirector.
-
-. /etc/rc.subr
-
-name="rspamd_redirector"
-rcvar=rspamd_redirector_enable
-
-load_rc_config $name
-
-: ${rspamd_redirector_enable:="NO"}
-
-pidfile=${rspamd_redirector_pidfile:-"/var/run/rspamd/redirector.pid"}
-
-command="%%PREFIX%%/bin/rspamd-redirector"
-command_interpreter="%%PREFIX%%/bin/perl"
-extra_commands="reload"
-sig_reload="USR1"
-stop_postcmd="rm -f $pidfile"
-
-run_rc_command "$1"