| 1 |
commit: f8903a96fbfc3562162c319d643d3ab8723f0abe |
| 2 |
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 27 10:28:41 2016 +0000 |
| 4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 27 12:59:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8903a96 |
| 7 |
|
| 8 |
net-im/ejabberd: Clean up files directory |
| 9 |
|
| 10 |
service file is no longer used because it's provided by upstream. Suffix |
| 11 |
"-3" in init and confd file names is no longer neccessary because |
| 12 |
there's only one version of the initd script. |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.0 |
| 15 |
|
| 16 |
net-im/ejabberd/ejabberd-16.04.ebuild | 4 ++-- |
| 17 |
.../ejabberd/files/{ejabberd-3.confd => ejabberd.confd} | 0 |
| 18 |
.../ejabberd/files/{ejabberd-3.initd => ejabberd.initd} | 2 +- |
| 19 |
net-im/ejabberd/files/ejabberd.service | 17 ----------------- |
| 20 |
4 files changed, 3 insertions(+), 20 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild |
| 23 |
index 7fd509d..211f21d 100644 |
| 24 |
--- a/net-im/ejabberd/ejabberd-16.04.ebuild |
| 25 |
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild |
| 26 |
@@ -224,8 +224,8 @@ src_install() { |
| 27 |
fperms 4750 "${epam_path}" |
| 28 |
fi |
| 29 |
|
| 30 |
- newconfd "${FILESDIR}/${PN}-3.confd" "${PN}" |
| 31 |
- newinitd "${FILESDIR}/${PN}-3.initd" "${PN}" |
| 32 |
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}" |
| 33 |
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
| 34 |
systemd_dounit "${PN}.service" |
| 35 |
systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" |
| 36 |
|
| 37 |
|
| 38 |
diff --git a/net-im/ejabberd/files/ejabberd-3.confd b/net-im/ejabberd/files/ejabberd.confd |
| 39 |
similarity index 100% |
| 40 |
rename from net-im/ejabberd/files/ejabberd-3.confd |
| 41 |
rename to net-im/ejabberd/files/ejabberd.confd |
| 42 |
|
| 43 |
diff --git a/net-im/ejabberd/files/ejabberd-3.initd b/net-im/ejabberd/files/ejabberd.initd |
| 44 |
similarity index 96% |
| 45 |
rename from net-im/ejabberd/files/ejabberd-3.initd |
| 46 |
rename to net-im/ejabberd/files/ejabberd.initd |
| 47 |
index 2827aeb..aed39b8 100644 |
| 48 |
--- a/net-im/ejabberd/files/ejabberd-3.initd |
| 49 |
+++ b/net-im/ejabberd/files/ejabberd.initd |
| 50 |
@@ -1,5 +1,5 @@ |
| 51 |
#!/sbin/openrc-run |
| 52 |
-# Copyright 1999-2013 Gentoo Foundation |
| 53 |
+# Copyright 1999-2016 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
# $Id$ |
| 56 |
|
| 57 |
|
| 58 |
diff --git a/net-im/ejabberd/files/ejabberd.service b/net-im/ejabberd/files/ejabberd.service |
| 59 |
deleted file mode 100644 |
| 60 |
index 0b79256..00000000 |
| 61 |
--- a/net-im/ejabberd/files/ejabberd.service |
| 62 |
+++ /dev/null |
| 63 |
@@ -1,17 +0,0 @@ |
| 64 |
-[Unit] |
| 65 |
-Description=A distributed, fault-tolerant Jabber/XMPP server |
| 66 |
-After=network.target |
| 67 |
- |
| 68 |
-[Service] |
| 69 |
-Type=oneshot |
| 70 |
-User=jabber |
| 71 |
-LimitNOFILE=16000 |
| 72 |
-RestartSec=5 |
| 73 |
-ExecStart=/usr/sbin/ejabberdctl \ |
| 74 |
- --config /etc/jabber/ejabberd.cfg --ctl-config /etc/jabber/ejabberdctl.cfg \ |
| 75 |
- --logs "/var/log/jabber" --spool "/var/spool/jabber" start |
| 76 |
-ExecStop=/usr/sbin/ejabberdctl stop |
| 77 |
-RemainAfterExit=yes |
| 78 |
- |
| 79 |
-[Install] |
| 80 |
-WantedBy=multi-user.target |
Archives