Skip to content
Snippets Groups Projects
Commit b04bb81f authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'ensure-runit-started-before-gitlab-sshd' into 'master'

parents 2ba2d18b af3f3a8c
No related branches found
No related tags found
2 merge requests!102heptapod#1237: making 0.38 the new oldstable,!90Merged upstream 15.9.0+ce.0 into heptapod branch
......@@ -83,10 +83,7 @@
# `account` custom resource will not create them.
include_recipe "gitlab::users"
if node['gitlab']['gitlab-rails']['enable']
include_recipe "gitlab::gitlab-shell"
include_recipe "gitlab::gitlab-rails"
end
include_recipe "gitlab::gitlab-rails" if node['gitlab']['gitlab-rails']['enable']
include_recipe "gitlab::selinux"
......@@ -109,6 +106,9 @@
# Install our runit instance
include_recipe "package::runit"
# Install shell after runit so `gitlab-sshd` comes up
include_recipe "gitlab::gitlab-shell" if node['gitlab']['gitlab-rails']['enable']
# Make global sysctl commands available
include_recipe "package::sysctl"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment