[patch] Initial split of daemons in patch form

deluge.patch (text/plain), 4.19 KB, created by Cameron Tacklind on 2010-12-31 09:53:47 UTC

--- /usr/portage/net-p2p/deluge/deluge-1.3.1.ebuild	2010-12-20 04:36:52.000000000 -0800
+++ /usr/local/portage/net-p2p/deluge/deluge-1.3.1.ebuild	2010-12-30 23:42:29.000000000 -0800
@@ -49,6 +49,8 @@
 	distutils_src_install
 	newinitd "${FILESDIR}"/deluged.init deluged
 	newconfd "${FILESDIR}"/deluged.conf deluged
+	newinitd "${FILESDIR}"/deluge-web.init deluge-web
+	newconfd "${FILESDIR}"/deluge-web.conf deluge-web
 }
 
 pkg_postinst() {
--- /usr/portage/net-p2p/deluge/files/deluge-web.conf	1969-12-31 16:00:00.000000000 -0800
+++ /usr/local/portage/net-p2p/deluge/files/deluge-web.conf	2010-12-31 00:05:50.000000000 -0800
@@ -0,0 +1,5 @@
+# /etc/conf.d/deluge-web
+# Change this to the user you want to run deluge-web as.
+# You may specify a group too, after a colon
+DELUGE_OPTS=""
+DELUGE_USER=""
--- /usr/portage/net-p2p/deluge/files/deluge-web.init	1969-12-31 16:00:00.000000000 -0800
+++ /usr/local/portage/net-p2p/deluge/files/deluge-web.init	2010-12-31 00:01:42.000000000 -0800
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/files/deluged.init,v 1.6 2010/10/02 15:36:03 armin76 Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ "${DELUGE_USER}" = "" ] ; then
+		eerror "Please edit /etc/conf.d/deluge-web"
+		eerror "You have to specify a user to run deluged as, as we will not run it as root!"
+		eerror "Modify DELUGE_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${DELUGE_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/deluge-web"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${DELUGE_USER%:*}" = "${DELUGE_USER}" ] ; then
+		return 0
+	else
+		if ! getent group "${DELUGE_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/deluge-web"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi	
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	if [ "${DELUGE_HOME}" = "" ] ; then
+		DELUGE_USER_HOME=$(getent passwd "${DELUGE_USER%:*}" | cut -d ':' -f 6)
+	else
+		DELUGE_USER_HOME=${DELUGE_HOME}
+	fi
+	
+	ebegin "Starting Deluge Web UI"
+	start-stop-daemon --start --background --pidfile \
+	/var/run/deluge-web.pid  --make-pidfile \
+	--exec /usr/bin/deluge-web -c "${DELUGE_USER}" \
+	-e HOME="${DELUGE_USER_HOME}" -- ${DELUGE_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Deluge Web UI"
+	start-stop-daemon --stop --user "${DELUGE_USER}" \
+	--name deluge-web --pidfile /var/run/deluge-web.pid
+	eend $?
+}
--- /usr/portage/net-p2p/deluge/files/deluged.conf	2008-12-28 04:07:30.000000000 -0800
+++ /usr/local/portage/net-p2p/deluge/files/deluged.conf	2010-12-31 00:01:27.000000000 -0800
@@ -2,6 +2,4 @@
 # Change this to the user you want to run deluged as.
 # You may specify a group too, after a colon
 DELUGED_USER=""
-DELUGEUI_START="false"
-DELUGEUI_OPTS="-u web"
-
+DELUGED_OPTS=""
--- /usr/portage/net-p2p/deluge/files/deluged.init	2010-10-02 08:36:48.000000000 -0700
+++ /usr/local/portage/net-p2p/deluge/files/deluged.init	2010-12-31 00:02:02.000000000 -0800
@@ -38,21 +38,12 @@
 	else
 		DELUGED_USER_HOME=${DELUGED_HOME}
 	fi
+
 	ebegin "Starting Deluged"
 	start-stop-daemon --start --user "${DELUGED_USER}" \
 	--name deluged --pidfile /var/run/deluged.pid --background --make-pidfile \
-	--exec /usr/bin/deluged -c "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize "${DELUGED_OPTS}"
+	--exec /usr/bin/deluged -c "${DELUGED_USER}" -e HOME=${DELUGED_USER_HOME} -- --do-not-daemonize ${DELUGED_OPTS}
 	eend $?
-
-	
-	if [ "${DELUGEUI_START}" = "true" ] ; then
-		ebegin "Starting Deluge"
-		start-stop-daemon --start --background --pidfile \
-		/var/run/deluge.pid  --make-pidfile \
-		--exec /usr/bin/deluge -c "${DELUGED_USER}" \
-		-e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS}
-		eend $?
-	fi
 }
 
 stop() {
@@ -60,12 +51,4 @@
 	start-stop-daemon --stop --user "${DELUGED_USER}" \
 	--name deluged --pidfile /var/run/deluged.pid
 	eend $?
-
-
-	if [ "${DELUGEUI_START}" = "true" ] ; then
-		ebegin "Stopping Deluge"
-		start-stop-daemon --stop --user "${DELUGED_USER}" \
-		--name deluge --pidfile /var/run/deluge.pid
-		eend $?
-	fi
 }