Gentoo Archives: gentoo-commits

From: "Amadeusz Piotr Żołnowski" <aidecoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
Date: Sun, 03 Jul 2016 07:44:29
Message-Id: 1467531846.f888bec998225e36910b02954e40593aff2bd15e.aidecoe@gentoo
1 commit: f888bec998225e36910b02954e40593aff2bd15e
2 Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 2 22:15:49 2016 +0000
4 Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 07:44:06 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f888bec9
7
8 net-im/ejabberd: Make ejabberd.service from upstream template
9
10 Gentoo-Bug: 587454
11
12 Package-Manager: portage-2.3.0
13
14 net-im/ejabberd/ejabberd-16.04.ebuild | 12 +++++++++++-
15 1 file changed, 11 insertions(+), 1 deletion(-)
16
17 diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild
18 index b7f818f..441023e 100644
19 --- a/net-im/ejabberd/ejabberd-16.04.ebuild
20 +++ b/net-im/ejabberd/ejabberd-16.04.ebuild
21 @@ -134,6 +134,15 @@ get_ejabberd_path() {
22 echo "$(get_erl_libs)/${P}"
23 }
24
25 +# Make ejabberd.service for systemd from upstream provided template.
26 +make_ejabberd_service() {
27 + sed -r \
28 + -e 's!@ctlscriptpath@!/usr/sbin!' \
29 + -e 's!(User|Group)=(.*)!\1=jabber!' \
30 + "${PN}.service.template" >"${PN}.service" \
31 + || die 'failed to make ejabberd.service'
32 +}
33 +
34 # Set paths to defined by net-im/jabber-base.
35 set_jabberbase_paths() {
36 sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
37 @@ -168,6 +177,7 @@ src_prepare() {
38 rebar_remove_deps
39 correct_ejabberd_paths
40 set_jabberbase_paths
41 + make_ejabberd_service
42 skip_docs
43 adjust_config
44 customize_epam_wrapper "${FILESDIR}/epam-wrapper"
45 @@ -215,7 +225,7 @@ src_install() {
46
47 newconfd "${FILESDIR}/${PN}-3.confd" "${PN}"
48 newinitd "${FILESDIR}/${PN}-3.initd" "${PN}"
49 - systemd_dounit "${FILESDIR}/${PN}.service"
50 + systemd_dounit "${PN}.service"
51 systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
52
53 insinto /etc/logrotate.d