Download as
Browse Code »

Commit dc88484f15d7b413499929f71658152f1a4bf267

Authored by Jacob Vosmaer
2 parents f13da919 b7298573
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Merge branch 'centos7' into 'master' 

Add systemd support for Centos 7

See merge request !191
Showing 4 changed files with 44 additions and 1 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @dc88484
... ... @@ -3,6 +3,9 @@
3 3 The latest version of this file can be found at the master branch of the
4 4 omnibus-gitlab repository.
5 5  
  6 +7.3.0
  7 +- Add systemd support for Centos 7
  8 +
6 9 7.2.0
7 10 - Pass environment variables to Unicorn and Sidekiq (Chris Portman)
8 11 - Add openssl_verify_mode to SMTP email configuration (Dionysius Marquis)
... ...
files/gitlab-cookbooks/runit/files/default/gitlab-runsvdir.service 0 → 100644
  Diff comments   View file @dc88484
... ... @@ -0,0 +1,6 @@
  1 +[Unit]
  2 +Description=GitLab Runit supervision process
  3 +
  4 +[Service]
  5 +ExecStart=/opt/gitlab/embedded/bin/runsvdir-start
  6 +Restart=always
... ...
files/gitlab-cookbooks/runit/recipes/default.rb
  Diff comments   View file @dc88484
... ... @@ -33,8 +33,10 @@ when "rhel"
33 33 else
34 34 if node['platform_version'] =~ /^5/
35 35 include_recipe "runit::sysvinit"
36   - else # >= 6.0
  36 + elsif node['platform_version'] =~ /^6/
37 37 include_recipe "runit::upstart"
  38 + elsif node['platform_version'] =~ /^7/
  39 + include_recipe "runit::systemd"
38 40 end
39 41 end
40 42 when "fedora"
... ...
files/gitlab-cookbooks/runit/recipes/systemd.rb 0 → 100644
  Diff comments   View file @dc88484
... ... @@ -0,0 +1,32 @@
  1 +#
  2 +# Cookbook Name:: runit
  3 +# Recipe:: systemd
  4 +#
  5 +# Copyright 2014 GitLab B.V.
  6 +#
  7 +# Licensed under the Apache License, Version 2.0 (the "License");
  8 +# you may not use this file except in compliance with the License.
  9 +# You may obtain a copy of the License at
  10 +#
  11 +# http://www.apache.org/licenses/LICENSE-2.0
  12 +#
  13 +# Unless required by applicable law or agreed to in writing, software
  14 +# distributed under the License is distributed on an "AS IS" BASIS,
  15 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  16 +# See the License for the specific language governing permissions and
  17 +# limitations under the License.
  18 +#
  19 +
  20 +link "/etc/systemd/system/default.target.wants/gitlab-runsvdir.service" do
  21 + to "/opt/gitlab/embedded/cookbooks/runit/files/default/gitlab-runsvdir.service"
  22 + notifies :run, 'execute[systemctl daemon-reload]', :immediately
  23 + notifies :run, 'execute[systemctl start gitlab-runsvdir]', :immediately
  24 +end
  25 +
  26 +execute "systemctl daemon-reload" do
  27 + action :nothing
  28 +end
  29 +
  30 +execute "systemctl start gitlab-runsvdir" do
  31 + action :nothing
  32 +end
... ...