From f8903a96fbfc3562162c319d643d3ab8723f0abe Mon Sep 17 00:00:00 2001
From: Amadeusz Żołnowski <aidecoe@gentoo.org>
Date: Sat, 27 Aug 2016 11:28:41 +0100
Subject: net-im/ejabberd: Clean up files directory

service file is no longer used because it's provided by upstream. Suffix
"-3" in init and confd file names is no longer neccessary because
there's only one version of the initd script.

Package-Manager: portage-2.3.0
---
 net-im/ejabberd/ejabberd-16.04.ebuild  |  4 +--
 net-im/ejabberd/files/ejabberd-3.confd |  5 ----
 net-im/ejabberd/files/ejabberd-3.initd | 55 ----------------------------------
 net-im/ejabberd/files/ejabberd.confd   |  5 ++++
 net-im/ejabberd/files/ejabberd.initd   | 55 ++++++++++++++++++++++++++++++++++
 net-im/ejabberd/files/ejabberd.service | 17 -----------
 6 files changed, 62 insertions(+), 79 deletions(-)
 delete mode 100644 net-im/ejabberd/files/ejabberd-3.confd
 delete mode 100644 net-im/ejabberd/files/ejabberd-3.initd
 create mode 100644 net-im/ejabberd/files/ejabberd.confd
 create mode 100644 net-im/ejabberd/files/ejabberd.initd
 delete mode 100644 net-im/ejabberd/files/ejabberd.service

(limited to 'net-im/ejabberd')

diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild
index 7fd509dcef46..211f21d76099 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -224,8 +224,8 @@ src_install() {
 		fperms 4750 "${epam_path}"
 	fi
 
-	newconfd "${FILESDIR}/${PN}-3.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}-3.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	systemd_dounit "${PN}.service"
 	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
 
diff --git a/net-im/ejabberd/files/ejabberd-3.confd b/net-im/ejabberd/files/ejabberd-3.confd
deleted file mode 100644
index b1e984e4d7ab..000000000000
--- a/net-im/ejabberd/files/ejabberd-3.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Please configure everything at /etc/jabber/ejabberdctl.cfg
-# Put here only command line arguments for ejabberdctl (if any are required)
-
-#EJABBERDCTL_OPTS=""
-
diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd-3.initd
deleted file mode 100644
index 2827aeb43d42..000000000000
--- a/net-im/ejabberd/files/ejabberd-3.initd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload"
-
-depend() {
-	use dns
-	need epmd net
-	provide jabber-server
-}
-
-start() {
-	if ejabberdctl status >/dev/null 2>&1; then
-		ewarn "ejabberd is already started (manually?)."
-		return 0
-	fi
-	ebegin "Starting ejabberd"
-	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ejabberd configuration"
-	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config
-	eend $?
-}
-
-stop() {
-	ejabberdctl status >/dev/null 2>&1
-	if test $? = 3; then
-		ewarn "ejabberd is already stopped (manually?)."
-		return 0
-	fi
-	ebegin "Stopping ejabberd"
-	if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
-		cnt=0
-		sleep 1
-		while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
-			echo -n .
-			cnt=`expr $cnt + 1`
-			if [ $cnt -ge 60 ] ; then
-				eend 1
-				break
-			fi
-			sleep 1
-		done
-		eend 0
-	else
-		eend 1
-		einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on."
-	fi
-	eend 0
-}
diff --git a/net-im/ejabberd/files/ejabberd.confd b/net-im/ejabberd/files/ejabberd.confd
new file mode 100644
index 000000000000..b1e984e4d7ab
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd.confd
@@ -0,0 +1,5 @@
+# Please configure everything at /etc/jabber/ejabberdctl.cfg
+# Put here only command line arguments for ejabberdctl (if any are required)
+
+#EJABBERDCTL_OPTS=""
+
diff --git a/net-im/ejabberd/files/ejabberd.initd b/net-im/ejabberd/files/ejabberd.initd
new file mode 100644
index 000000000000..aed39b87b052
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd.initd
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_started_commands="reload"
+
+depend() {
+	use dns
+	need epmd net
+	provide jabber-server
+}
+
+start() {
+	if ejabberdctl status >/dev/null 2>&1; then
+		ewarn "ejabberd is already started (manually?)."
+		return 0
+	fi
+	ebegin "Starting ejabberd"
+	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ejabberd configuration"
+	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config
+	eend $?
+}
+
+stop() {
+	ejabberdctl status >/dev/null 2>&1
+	if test $? = 3; then
+		ewarn "ejabberd is already stopped (manually?)."
+		return 0
+	fi
+	ebegin "Stopping ejabberd"
+	if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
+		cnt=0
+		sleep 1
+		while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
+			echo -n .
+			cnt=`expr $cnt + 1`
+			if [ $cnt -ge 60 ] ; then
+				eend 1
+				break
+			fi
+			sleep 1
+		done
+		eend 0
+	else
+		eend 1
+		einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on."
+	fi
+	eend 0
+}
diff --git a/net-im/ejabberd/files/ejabberd.service b/net-im/ejabberd/files/ejabberd.service
deleted file mode 100644
index 0b792565b75e..000000000000
--- a/net-im/ejabberd/files/ejabberd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=oneshot
-User=jabber
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/sbin/ejabberdctl \
-	--config /etc/jabber/ejabberd.cfg --ctl-config /etc/jabber/ejabberdctl.cfg \
-	--logs "/var/log/jabber" --spool "/var/spool/jabber" start
-ExecStop=/usr/sbin/ejabberdctl stop
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
-- 
cgit v1.2.3-18-g5258