[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/

[Dirkjan Ochtman]

commit:     c40a1c9edc75e2c5be3d3ff7a2c360e938a2bf91
Author:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 15:28:57 2016 +0000
Commit:     Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 15:29:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40a1c9e

mail-filter/rspamd: remove reload from init script for 1.1.2

Package-Manager: portage-2.2.26

 mail-filter/rspamd/files/rspamd.init-r1 | 43 +++++++++++++++++++++++++++++++++
 mail-filter/rspamd/rspamd-1.1.2.ebuild  |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/mail-filter/rspamd/files/rspamd.init-r1 b/mail-filter/rspamd/files/rspamd.init-r1
new file mode 100644
index 0000000..d26c41d
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd.init-r1
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+RUNDIR=/var/run/rspamd
+PIDFILE=$RUNDIR/rspamd.pid
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	/usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.sysvinit.conf > /dev/null \
+		|| return 1
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ${SVCNAME}"
+
+	mkdir -m0750 -p $RUNDIR
+	chown rspamd:rspamd $RUNDIR
+	chmod g+s $RUNDIR
+	rm -f $RUNDIR/$SVCNAME.sock
+
+	start-stop-daemon --start --quiet --pidfile $PIDFILE -u rspamd -g rspamd \
+						--exec /usr/bin/rspamd
+	eend $?
+}
+
+stop() {
+	if [ "${RC_CMD}" = "restart" ] ; then
+		checkconfig || return 1
+	fi
+
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE \
+						--exec /usr/bin/rspamd
+	eend $?
+}

diff --git a/mail-filter/rspamd/rspamd-1.1.2.ebuild b/mail-filter/rspamd/rspamd-1.1.2.ebuild
index c5ecabb..fead741 100644
--- a/mail-filter/rspamd/rspamd-1.1.2.ebuild
+++ b/mail-filter/rspamd/rspamd-1.1.2.ebuild
@@ -50,7 +50,7 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	newinitd "${FILESDIR}/rspamd.init" rspamd
+	newinitd "${FILESDIR}/rspamd.init-r1" rspamd
 
 	dodir /var/lib/rspamd
 	dodir /var/log/rspamd