From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7BB69139083 for ; Wed, 20 Dec 2017 22:14:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8247E110C; Wed, 20 Dec 2017 22:14:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 988BCE110C for ; Wed, 20 Dec 2017 22:14:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58C8233D4A6 for ; Wed, 20 Dec 2017 22:13:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A76F8AE89 for ; Wed, 20 Dec 2017 22:13:56 +0000 (UTC) From: "Kristian Fiskerstrand" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" Message-ID: <1513808027.fc9581d755e96bfd4eef2eb91669559f6d87ea0f.k_f@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/deluge/files/deluge-web.service net-p2p/deluge/files/deluged.conf net-p2p/deluge/files/deluged.init net-p2p/deluge/files/deluged.service X-VCS-Directories: net-p2p/deluge/files/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: fc9581d755e96bfd4eef2eb91669559f6d87ea0f X-VCS-Branch: master Date: Wed, 20 Dec 2017 22:13:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 09451af5-45f4-4a7f-b5ec-3326c8177581 X-Archives-Hash: 24668f55b571bbad4de8ba384cead877 commit: fc9581d755e96bfd4eef2eb91669559f6d87ea0f Author: PPed72 iol it> AuthorDate: Wed Nov 8 11:45:35 2017 +0000 Commit: Kristian Fiskerstrand gentoo org> CommitDate: Wed Dec 20 22:13:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc9581d7 net-p2p/deluge: 'files' folder cleanup Bug: https://bugs.gentoo.org/636860 net-p2p/deluge/files/deluge-web.service | 11 ----- net-p2p/deluge/files/deluged.conf | 9 ----- net-p2p/deluge/files/deluged.init | 71 --------------------------------- net-p2p/deluge/files/deluged.service | 13 ------ 4 files changed, 104 deletions(-) diff --git a/net-p2p/deluge/files/deluge-web.service b/net-p2p/deluge/files/deluge-web.service deleted file mode 100644 index 426401a95e0..00000000000 --- a/net-p2p/deluge/files/deluge-web.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Deluge WebUI -After=deluged.service - -[Service] -User=deluge -ExecStart=/usr/bin/deluge-web - -[Install] -WantedBy=multi-user.target - diff --git a/net-p2p/deluge/files/deluged.conf b/net-p2p/deluge/files/deluged.conf deleted file mode 100644 index 21b375d5c97..00000000000 --- a/net-p2p/deluge/files/deluged.conf +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/conf.d/deluged -# Change this to the user you want to run deluged as. -# You may specify a group too, after a colon -DELUGED_USER="" -# DELUGED_UMASK="0002" -# DELUGED_OPTS="-p 58846" -DELUGEUI_START="false" -DELUGEUI_OPTS="-u web" - diff --git a/net-p2p/deluge/files/deluged.init b/net-p2p/deluge/files/deluged.init deleted file mode 100644 index 0fd9429fb05..00000000000 --- a/net-p2p/deluge/files/deluged.init +++ /dev/null @@ -1,71 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later - -depend() { - need net -} - -checkconfig() { - if [ "${DELUGED_USER}" = "" ] ; then - eerror "Please edit /etc/conf.d/deluged" - eerror "You have to specify a user to run deluged as, as we will not run it as root!" - eerror "Modify DELUGED_USER to your needs (you can also add a group, after a colon)" - return 1 - fi - if ! getent passwd "${DELUGED_USER%:*}" >/dev/null ; then - eerror "Please edit /etc/conf.d/deluged" - eerror "Your user has to exist!" - return 1 - fi - if [ "${DELUGED_USER%:*}" = "${DELUGED_USER}" ] ; then - return 0 - else - if ! getent group "${DELUGED_USER#*:}" >/dev/null ; then - eerror "Please edit /etc/conf.d/deluged" - eerror "Your group has to exist too!" - return 1 - fi - fi - return 0 -} - -start() { - checkconfig || return $? - if [ "${DELUGED_HOME}" = "" ] ; then - DELUGED_USER_HOME=$(getent passwd "${DELUGED_USER%:*}" | cut -d ':' -f 6) - else - DELUGED_USER_HOME=${DELUGED_HOME} - fi - ebegin "Starting Deluged" - start-stop-daemon --start --user "${DELUGED_USER%:*}" \ - --name deluged --pidfile /run/deluged.pid --background --make-pidfile \ - ${DELUGED_UMASK:+--umask ${DELUGED_UMASK}} \ - --exec /usr/bin/deluged -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 \ - /run/deluge.pid --make-pidfile \ - --exec /usr/bin/deluge --user "${DELUGED_USER%:*}" \ - -e HOME="${DELUGED_USER_HOME}" -- ${DELUGEUI_OPTS} - eend $? - fi -} - -stop() { - ebegin "Stopping Deluged" - start-stop-daemon --stop --user "${DELUGED_USER%:*}" \ - --name deluged --pidfile /run/deluged.pid - eend $? - - - if [ "${DELUGEUI_START}" = "true" ] ; then - ebegin "Stopping Deluge" - start-stop-daemon --stop --user "${DELUGED_USER%:*}" \ - --name deluge --pidfile /run/deluge.pid - eend $? - fi -} diff --git a/net-p2p/deluge/files/deluged.service b/net-p2p/deluge/files/deluged.service deleted file mode 100644 index 74876b008cc..00000000000 --- a/net-p2p/deluge/files/deluged.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Deluge BitTorrent client -After=network.target local-fs.target -Wants=local-fs.target - -[Service] -EnvironmentFile=/etc/conf.d/deluged -User=deluge -Group=deluge -ExecStart=/usr/bin/deluged -d -p $DELUGED_PORT $DELUGED_OPTIONS - -[Install] -WantedBy=multi-user.target