commit: cfed4d10bd3144ed782b625e266cedd533d505d6 Author: Henning Schild <henning <AT> hennsch <DOT> de> AuthorDate: Mon Mar 28 18:31:43 2022 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Tue Mar 29 02:37:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfed4d10
dev-util/gitlab-runner: fix init script syntax Closes: https://bugs.gentoo.org/836305 Closes: https://github.com/gentoo/gentoo/pull/24795 Thanks-to: Henning Schild <henning <AT> hennsch.de> Signed-off-by: William Hubbs <williamh <AT> gentoo.org> dev-util/gitlab-runner/files/gitlab-runner.initd | 11 +++++++---- ...ab-runner-14.9.1.ebuild => gitlab-runner-14.9.1-r1.ebuild} | 0 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dev-util/gitlab-runner/files/gitlab-runner.initd b/dev-util/gitlab-runner/files/gitlab-runner.initd index 8ae45b510fd0..0e5c5ed224b6 100644 --- a/dev-util/gitlab-runner/files/gitlab-runner.initd +++ b/dev-util/gitlab-runner/files/gitlab-runner.initd @@ -1,20 +1,23 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command="/usr/bin/gitlab-runner" +runner_datadir="${runner_datadir:-/var/lib/gitlab-runner}" command_args="run --config ${runner_config:-/etc/gitlab-runner/config.toml} --service ${runner_service:-${RC_SVCNAME}} --user ${runner_user:-gitlab-runner} - --working-directory ${runner_datadir:-/var/lib/gitlab-runner} + --working-directory ${runner_datadir} ${RUNNER_OPTS}" command_background=true extra_started_commands="reload" name="${name:-GitLab Runner}" pidfile="/run/${RC_SVCNAME}.pid" -output_log="${output_log:-${runner_logdir}/gitlab-runner.log" -error_log="${error_log:-${runner_logdir}/gitlab-runner.err" +runner_user="${runner_user:-gitlab-runner}" +runner_logdir="${runner_logdir:-/var/log/gitlab-runner}" +output_log="${output_log:-${runner_logdir}/gitlab-runner.log}" +error_log="${error_log:-${runner_logdir}/gitlab-runner.err}" retry="QUIT/60/TERM/60" required_files="${runner_config}" diff --git a/dev-util/gitlab-runner/gitlab-runner-14.9.1.ebuild b/dev-util/gitlab-runner/gitlab-runner-14.9.1-r1.ebuild similarity index 100% rename from dev-util/gitlab-runner/gitlab-runner-14.9.1.ebuild rename to dev-util/gitlab-runner/gitlab-runner-14.9.1-r1.ebuild
