Date: Fri, 6 Nov 2020 18:53:51 +0000 (UTC) From: Vsevolod Stakhov <vsevolod@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554311 - in head/mail: rspamd rspamd-devel rspamd-devel/files rspamd/files Message-ID: <202011061853.0A6IrpXp081600@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Fri Nov 6 18:53:51 2020 New Revision: 554311 URL: https://svnweb.freebsd.org/changeset/ports/554311 Log: - Run main process as root and drop worker privileges PR: 250904 Submitted by: Alexander Moisseev <moiseev at mezonplus.ru> Modified: head/mail/rspamd-devel/Makefile head/mail/rspamd-devel/files/pkg-message.in head/mail/rspamd-devel/files/rspamd.in head/mail/rspamd/Makefile head/mail/rspamd/files/pkg-message.in head/mail/rspamd/files/rspamd.in Modified: head/mail/rspamd-devel/Makefile ============================================================================== --- head/mail/rspamd-devel/Makefile Fri Nov 6 18:51:36 2020 (r554310) +++ head/mail/rspamd-devel/Makefile Fri Nov 6 18:53:51 2020 (r554311) @@ -2,7 +2,7 @@ PORTNAME= rspamd PORTVERSION= 2.6.a1.20200929 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail PKGNAMESUFFIX= -devel Modified: head/mail/rspamd-devel/files/pkg-message.in ============================================================================== --- head/mail/rspamd-devel/files/pkg-message.in Fri Nov 6 18:51:36 2020 (r554310) +++ head/mail/rspamd-devel/files/pkg-message.in Fri Nov 6 18:53:51 2020 (r554311) @@ -5,6 +5,9 @@ rspamd_enable="YES" + - Optionally you can adjust the user which runs Rspamd workers with the + variables rspamd_worker_user and rspamd_worker_group (default rspamd:rspamd). + - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf has been created in the /usr/local/etc/newsyslog.conf.d directory. You can edit %%ETCDIR%%/rspamd.newsyslog.conf Modified: head/mail/rspamd-devel/files/rspamd.in ============================================================================== --- head/mail/rspamd-devel/files/rspamd.in Fri Nov 6 18:51:36 2020 (r554310) +++ head/mail/rspamd-devel/files/rspamd.in Fri Nov 6 18:53:51 2020 (r554311) @@ -12,9 +12,9 @@ # rspamd_enable (bool): Set to "NO" by default. # Set it to "YES" to enable rspamd. # -# rspamd_user (str): Default to "rspamd". +# rspamd_worker_user (str): Default to "rspamd". # -# rspamd_group (str): Default to "rspamd". +# rspamd_worker_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="rspamd"} -: ${rspamd_group="rspamd"} +: ${rspamd_worker_user="rspamd"} +: ${rspamd_worker_group="rspamd"} : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"} pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"} @@ -40,7 +40,7 @@ configtest_cmd="rspamd_checkconfig" reopenlog_cmd="reopenlog_cmd" required_files=%%PREFIX%%/etc/rspamd/rspamd.conf -command_args="-u ${rspamd_user} -g ${rspamd_group}" +command_args="-u ${rspamd_worker_user} -g ${rspamd_worker_group}" extra_commands="reload configtest reopenlog" stop_postcmd="rm -f $pidfile" sig_reload="HUP" Modified: head/mail/rspamd/Makefile ============================================================================== --- head/mail/rspamd/Makefile Fri Nov 6 18:51:36 2020 (r554310) +++ head/mail/rspamd/Makefile Fri Nov 6 18:53:51 2020 (r554311) @@ -2,7 +2,7 @@ PORTNAME= rspamd PORTVERSION= 2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MAINTAINER= vsevolod@FreeBSD.org Modified: head/mail/rspamd/files/pkg-message.in ============================================================================== --- head/mail/rspamd/files/pkg-message.in Fri Nov 6 18:51:36 2020 (r554310) +++ head/mail/rspamd/files/pkg-message.in Fri Nov 6 18:53:51 2020 (r554311) @@ -5,6 +5,9 @@ rspamd_enable="YES" + - Optionally you can adjust the user which runs Rspamd workers with the + variables rspamd_worker_user and rspamd_worker_group (default rspamd:rspamd). + - A symbolic link to %%ETCDIR%%/rspamd.newsyslog.conf has been created in the /usr/local/etc/newsyslog.conf.d directory. You can edit %%ETCDIR%%/rspamd.newsyslog.conf Modified: head/mail/rspamd/files/rspamd.in ============================================================================== --- head/mail/rspamd/files/rspamd.in Fri Nov 6 18:51:36 2020 (r554310) +++ head/mail/rspamd/files/rspamd.in Fri Nov 6 18:53:51 2020 (r554311) @@ -12,9 +12,9 @@ # rspamd_enable (bool): Set to "NO" by default. # Set it to "YES" to enable rspamd. # -# rspamd_user (str): Default to "rspamd". +# rspamd_worker_user (str): Default to "rspamd". # -# rspamd_group (str): Default to "rspamd". +# rspamd_worker_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="rspamd"} -: ${rspamd_group="rspamd"} +: ${rspamd_worker_user="rspamd"} +: ${rspamd_worker_group="rspamd"} : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"} pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"} @@ -40,7 +40,7 @@ configtest_cmd="rspamd_checkconfig" reopenlog_cmd="reopenlog_cmd" required_files=%%PREFIX%%/etc/rspamd/rspamd.conf -command_args="-u ${rspamd_user} -g ${rspamd_group}" +command_args="-u ${rspamd_worker_user} -g ${rspamd_worker_group}" extra_commands="reload configtest reopenlog" stop_postcmd="rm -f $pidfile" sig_reload="HUP"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011061853.0A6IrpXp081600>