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

Merge branch 'rails-app-role' into 'master'

Enable nginx with application_role

Closes #8584

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7858



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarBen Bodenmiller <bbodenmiller@gmail.com>
No related branches found
No related tags found
1 merge request!155Merge upstream Omnibus GitLab into Omnibus Heptapod
......@@ -19,6 +19,7 @@
return unless Gitlab['application_role']['enable']
Gitlab['gitlab_rails']['enable'] = true if Gitlab['gitlab_rails']['enable'].nil?
Gitlab['nginx']['enable'] = true if Gitlab['nginx']['enable'].nil?
Services.enable_group('rails')
end
......
......@@ -95,5 +95,6 @@
expect(ApplicationRole).to have_received(:load_role)
expect(Gitlab['gitlab_rails']['enable']).to eq true
expect(Gitlab['nginx']['enable']).to eq true
expect(Services).to have_received(:enable_group).with('rails').once
end
......@@ -98,5 +99,13 @@
expect(Services).to have_received(:enable_group).with('rails').once
end
it 'leaves nginx disabled when requested' do
stub_gitlab_rb(application_role: { enable: true }, nginx: { enable: false })
Gitlab.load_roles
expect(Gitlab['nginx']['enable']).to eq false
end
end
describe 'MonitoringRole' do
......
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