Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/ergo/files/, net-irc/ergo/
Date: Tue, 29 Jun 2021 04:52:44
Message-Id: 1624942335.289aa33277dcba453d0c2519c49ad947f4ea504a.sam@gentoo
1 commit: 289aa33277dcba453d0c2519c49ad947f4ea504a
2 Author: Jonathan Davies <jpds <AT> protonmail <DOT> com>
3 AuthorDate: Fri Jun 25 15:00:22 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 29 04:52:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289aa332
7
8 net-irc/ergo: Fixed OpenRC init script to handle backgrounding correctly and added reload function.
9
10 Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/21425
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 net-irc/ergo/{ergo-2.7.0.ebuild => ergo-2.7.0-r1.ebuild} | 0
15 net-irc/ergo/files/ergo.initd | 10 +++++++++-
16 2 files changed, 9 insertions(+), 1 deletion(-)
17
18 diff --git a/net-irc/ergo/ergo-2.7.0.ebuild b/net-irc/ergo/ergo-2.7.0-r1.ebuild
19 similarity index 100%
20 rename from net-irc/ergo/ergo-2.7.0.ebuild
21 rename to net-irc/ergo/ergo-2.7.0-r1.ebuild
22
23 diff --git a/net-irc/ergo/files/ergo.initd b/net-irc/ergo/files/ergo.initd
24 index bc2b7dd064d..025d6951862 100644
25 --- a/net-irc/ergo/files/ergo.initd
26 +++ b/net-irc/ergo/files/ergo.initd
27 @@ -1,6 +1,8 @@
28 #!/sbin/openrc-run
29 command=/usr/bin/ergo
30 -command_args="--conf ${ERGO_CONFIGFILE:-"/etc/ergo/ircd.yaml"}"
31 +command_args="run --conf ${ERGO_CONFIGFILE:-"/etc/ergo/ircd.yaml"}"
32 +command_background=true
33 +extra_started_commands="reload"
34 pidfile=/var/run/ergo.pid
35 name="ergo"
36 description="ergo IRC daemon"
37 @@ -9,3 +11,9 @@ depend() {
38 use dns
39 provide ircd
40 }
41 +
42 +reload() {
43 + ebegin "Reloading ${RC_SVCNAME}"
44 + start-stop-daemon --signal HUP --pidfile "${pidfile}"
45 + eend $?
46 +}