summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-05-17 19:39:26 (GMT)
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2014-05-25 18:31:45 (GMT)
commit4d6a224da37632ffaff4e01679f4c86395b44a8c (patch)
treefac7dbe935b886df3e9afcf8f0f3cd2d57ef9ce9
parent9c596c61769ade0087b1ad2a6765eaf6f3a4a79d (diff)
downloaddefinitions-4d6a224da37632ffaff4e01679f4c86395b44a8c.tar.gz
baserock has /bin/kill, not /usr/bin/kill
-rw-r--r--gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service4
-rw-r--r--gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service4
-rw-r--r--gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service4
3 files changed, 6 insertions, 6 deletions
diff --git a/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service b/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service
index 7e7c12b..dfc84d9 100644
--- a/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service
+++ b/gitlab-ci-runner/usr/share/gitlab-install/systemd-units/gitlab-ci-runner.service
@@ -7,8 +7,8 @@ WorkingDirectory=/root/gitlab-ci-runner
SyslogIdentifier=gitlab-ci-runner
ExecStart=/usr/bin/bundle exec "./bin/runner"
-ExecStop=/usr/bin/kill -QUIT $MAINPID
-ExecReload=/usr/bin/kill -USR2 $MAINPID
+ExecStop=/bin/kill -s QUIT $MAINPID
+ExecReload=/bin/kill -s USR2 $MAINPID
[Install]
WantedBy=multi-user.target
diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service
index 811b3fc..151f967 100644
--- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service
+++ b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service
@@ -17,8 +17,8 @@ SyslogIdentifier=gitlab-ci-unicorn
PIDFile=/home/gitlab_ci/gitlab-ci/tmp/pids/unicorn.pid
ExecStart=/usr/bin/bundle exec "unicorn_rails -c /home/gitlab_ci/gitlab-ci/config/unicorn.rb -E production"
-ExecStop=/usr/bin/kill -QUIT $MAINPID
-ExecReload=/usr/bin/kill -USR2 $MAINPID
+ExecStop=/bin/kill -s QUIT $MAINPID
+ExecReload=/bin/kill -s USR2 $MAINPID
[Install]
WantedBy=gitlab.target
diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service
index 71e3d84..a901d32 100644
--- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service
+++ b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service
@@ -17,8 +17,8 @@ SyslogIdentifier=gitlab-unicorn
PIDFile=/home/git/gitlab/tmp/pids/unicorn.pid
ExecStart=/usr/bin/bundle exec "unicorn_rails -c /home/git/gitlab/config/unicorn.rb -E production"
-ExecStop=/usr/bin/kill -QUIT $MAINPID
-ExecReload=/usr/bin/kill -USR2 $MAINPID
+ExecStop=/bin/kill -s QUIT $MAINPID
+ExecReload=/bin/kill -s USR2 $MAINPID
[Install]
WantedBy=gitlab.target