| 1 |
commit: cfed4d10bd3144ed782b625e266cedd533d505d6 |
| 2 |
Author: Henning Schild <henning <AT> hennsch <DOT> de> |
| 3 |
AuthorDate: Mon Mar 28 18:31:43 2022 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 29 02:37:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfed4d10 |
| 7 |
|
| 8 |
dev-util/gitlab-runner: fix init script syntax |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/836305 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/24795 |
| 12 |
|
| 13 |
Thanks-to: Henning Schild <henning <AT> hennsch.de> |
| 14 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-util/gitlab-runner/files/gitlab-runner.initd | 11 +++++++---- |
| 17 |
...ab-runner-14.9.1.ebuild => gitlab-runner-14.9.1-r1.ebuild} | 0 |
| 18 |
2 files changed, 7 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/gitlab-runner/files/gitlab-runner.initd b/dev-util/gitlab-runner/files/gitlab-runner.initd |
| 21 |
index 8ae45b510fd0..0e5c5ed224b6 100644 |
| 22 |
--- a/dev-util/gitlab-runner/files/gitlab-runner.initd |
| 23 |
+++ b/dev-util/gitlab-runner/files/gitlab-runner.initd |
| 24 |
@@ -1,20 +1,23 @@ |
| 25 |
#!/sbin/openrc-run |
| 26 |
-# Copyright 1999-2018 Gentoo Authors |
| 27 |
+# Copyright 1999-2022 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
command="/usr/bin/gitlab-runner" |
| 31 |
+runner_datadir="${runner_datadir:-/var/lib/gitlab-runner}" |
| 32 |
command_args="run |
| 33 |
--config ${runner_config:-/etc/gitlab-runner/config.toml} |
| 34 |
--service ${runner_service:-${RC_SVCNAME}} |
| 35 |
--user ${runner_user:-gitlab-runner} |
| 36 |
- --working-directory ${runner_datadir:-/var/lib/gitlab-runner} |
| 37 |
+ --working-directory ${runner_datadir} |
| 38 |
${RUNNER_OPTS}" |
| 39 |
command_background=true |
| 40 |
extra_started_commands="reload" |
| 41 |
name="${name:-GitLab Runner}" |
| 42 |
pidfile="/run/${RC_SVCNAME}.pid" |
| 43 |
-output_log="${output_log:-${runner_logdir}/gitlab-runner.log" |
| 44 |
-error_log="${error_log:-${runner_logdir}/gitlab-runner.err" |
| 45 |
+runner_user="${runner_user:-gitlab-runner}" |
| 46 |
+runner_logdir="${runner_logdir:-/var/log/gitlab-runner}" |
| 47 |
+output_log="${output_log:-${runner_logdir}/gitlab-runner.log}" |
| 48 |
+error_log="${error_log:-${runner_logdir}/gitlab-runner.err}" |
| 49 |
retry="QUIT/60/TERM/60" |
| 50 |
required_files="${runner_config}" |
| 51 |
|
| 52 |
|
| 53 |
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 |
| 54 |
similarity index 100% |
| 55 |
rename from dev-util/gitlab-runner/gitlab-runner-14.9.1.ebuild |
| 56 |
rename to dev-util/gitlab-runner/gitlab-runner-14.9.1-r1.ebuild |
Archives