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

diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild
index 7fd509dcef46f6dd79fff07be5f15abf5eb40f9c..211f21d76099627d85912f86f9d97809b952b7ff 100644 (file)
--- 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.confd
similarity index 100%
rename from net-im/ejabberd/files/ejabberd-3.confd
rename to net-im/ejabberd/files/ejabberd.confd

diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd.initd
similarity index 96%
rename from net-im/ejabberd/files/ejabberd-3.initd
rename to net-im/ejabberd/files/ejabberd.initd
index 2827aeb43d42575def7b6ebe32705c102ac75bb3..aed39b87b052f3c392a533d487ead9c061189e4d 100644 (file)
--- a/net-im/ejabberd/files/ejabberd-3.initd
+++ b/net-im/ejabberd/files/ejabberd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-im/ejabberd/files/ejabberd.service b/net-im/ejabberd/files/ejabberd.service
deleted file mode 100644 (file)
index 0b79256..0000000
--- 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