commit: 606a78b496eff09146c70ba53059d5a5c755216c Author: Josiah Mullins <jomull01 <AT> protonmail <DOT> com> AuthorDate: Thu Jan 9 17:31:44 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Jan 13 06:09:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=606a78b4
net-libs/tox: fix to openrc init script. This commit unifies the location of the PID file for the daemon in both the openrc script and the daemon's config file. In addition,the script now checks the keys directory for existence and correct permissions. Signed-off-by: Josiah M. Mullins <JoMull01 <AT> protonmail.com> Closes: https://bugs.gentoo.org/691772 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-libs/tox/files/initd | 6 +++++- net-libs/tox/files/tox-bootstrapd.conf | 11 +++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/net-libs/tox/files/initd b/net-libs/tox/files/initd index 101d3297056..49880897a1a 100644 --- a/net-libs/tox/files/initd +++ b/net-libs/tox/files/initd @@ -1,7 +1,10 @@ #!/sbin/openrc-run PIDDIR=/run/tox-bootstrapd -PIDFILE="${PIDDIR}"/tox-bootstrap.pid +PIDFILE="${PIDDIR}"/tox-bootstrapd.pid +KEYSDIR=/var/lib/tox-bootstrapd +TOX_USER=tox +TOX_GROUP=tox depend() { need net @@ -11,6 +14,7 @@ start() { ebegin "Starting tox-dht-bootstrap daemon" checkpath -d -q -o "${TOX_USER}":"${TOX_GROUP}" "${PIDDIR}" + checkpath -d -q -o "${TOX_USER}":"${TOX_GROUP}" "${KEYSDIR}" start-stop-daemon --start \ --pidfile "${PIDFILE}" \ diff --git a/net-libs/tox/files/tox-bootstrapd.conf b/net-libs/tox/files/tox-bootstrapd.conf index 3413f5907d4..34836de6287 100644 --- a/net-libs/tox/files/tox-bootstrapd.conf +++ b/net-libs/tox/files/tox-bootstrapd.conf @@ -5,13 +5,16 @@ port = 33445 // A key file is like a password, so keep it where no one can read it. // If there is no key file, a new one will be generated. -// The daemon should have permission to read/write it. +// If you change this directory, either change the keys directory +// in the /etc/init.d/tox-dht-daemon script or manually set the +// new directory to have user "tox" and group "tox". keys_file_path = "/var/lib/tox-bootstrapd/keys" // The PID file written to by the daemon. -// Make sure that the user that daemon runs as has permissions to write to the -// PID file. -pid_file_path = "/var/run/tox-bootstrapd/tox-bootstrapd.pid" +// Make sure that the user that daemon runs as has permissions to +// write to the PID file. If you change this file, please edit the +// etc/init.d/tox-dht-daemon script to reflect the change. +pid_file_path = "/run/tox-bootstrapd/tox-bootstrapd.pid" // Enable IPv6. enable_ipv6 = true
