Merge branch 'runit_for_debian_8' into 'master'

Runit for debian 8

See merge request !296
This commit is contained in:
Marin Jankovski 2015-03-16 19:30:37 +00:00
commit 6f8a9e2c82
2 changed files with 10 additions and 1 deletions

View File

@ -21,7 +21,11 @@ case node["platform_family"]
when "debian"
case node["platform"]
when "debian"
include_recipe "runit::sysvinit"
if node["platform_version"] =~ /^8/
include_recipe "runit::systemd"
else
include_recipe "runit::sysvinit"
end
else
include_recipe "runit::upstart"
end

View File

@ -17,6 +17,11 @@
# limitations under the License.
#
directory "/etc/systemd/system/default.target.wants" do
recursive true
not_if { ::File.directory?("/etc/systemd/system/default.target.wants") }
end
link "/etc/systemd/system/default.target.wants/gitlab-runsvdir.service" do
to "/opt/gitlab/embedded/cookbooks/runit/files/default/gitlab-runsvdir.service"
notifies :run, 'execute[systemctl daemon-reload]', :immediately