[packages/gitlab-ci-multi-runner] initscript integration
glen
glen at pld-linux.org
Fri Nov 4 17:21:26 CET 2016
commit 98c01f80b31dbcdea3dce48262f2fe39439ab658
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Nov 4 18:01:49 2016 +0200
initscript integration
gitlab-ci-multi-runner.service | 4 ++--
gitlab-ci-multi-runner.spec | 19 ++++++++++++++++++-
2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/gitlab-ci-multi-runner.spec b/gitlab-ci-multi-runner.spec
index 440760c..da2e673 100644
--- a/gitlab-ci-multi-runner.spec
+++ b/gitlab-ci-multi-runner.spec
@@ -29,7 +29,9 @@ URL: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner
BuildRequires: git-core
%{?with_bindata:BuildRequires: go-bindata >= 3.0.7-1.a0ff2567}
BuildRequires: golang >= 1.4
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.647
+Requires(post,preun): /sbin/chkconfig
+Requires(post,preun,postun): systemd-units >= 38
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
@@ -40,6 +42,8 @@ Requires: bash
Requires: ca-certificates
Requires: curl
Requires: git-core
+Requires: rc-scripts
+Requires: systemd-units >= 0.38
Requires: tar
Suggests: docker >= 1.8
Provides: group(gitlab-runner)
@@ -138,6 +142,19 @@ if [ "$1" = "0" ]; then
%userremove gitlab-runner
%groupremove gitlab-runner
fi
+%systemd_reload
+
+%post
+/sbin/chkconfig --add %{name}
+%service %{name} restart
+%systemd_post %{name}.service
+
+%preun
+if [ "$1" = "0" ]; then
+ %service -q %{name} stop
+ /sbin/chkconfig --del %{name}
+fi
+%systemd_preun %{name}.service
%files
%defattr(644,root,root,755)
diff --git a/gitlab-ci-multi-runner.service b/gitlab-ci-multi-runner.service
index 9bd226a..6985f30 100644
--- a/gitlab-ci-multi-runner.service
+++ b/gitlab-ci-multi-runner.service
@@ -11,8 +11,8 @@ After=syslog.target network.target
# http://0pointer.de/public/systemd-man/systemd.exec.html
[Service]
Type=simple
-User=gitlab_ci_multi_runner
-Group=gitlab_ci_multi_runner
+User=gitlab-runner
+Group=gitlab-runner
ExecStart=/usr/bin/gitlab-ci-multi-runner run
# if we crash, restart
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ci-multi-runner.git/commitdiff/2635dbafd6db2865d3f2fc4e04712b60b5acac79
More information about the pld-cvs-commit
mailing list