# HG changeset patch # User Ben Bodenmiller <bbodenmiller@gmail.com> # Date 1725446264 0 # Wed Sep 04 10:37:44 2024 +0000 # Node ID 7409d690aeb415b14513e4a473c4fbcaf2d4921b # Parent eaed06bca85c08c7714c3f5e23c5bb8b17794252 Enable nginx with application_role Changelog: changed diff --git a/files/gitlab-cookbooks/package/libraries/config/roles/application.rb b/files/gitlab-cookbooks/package/libraries/config/roles/application.rb --- a/files/gitlab-cookbooks/package/libraries/config/roles/application.rb +++ b/files/gitlab-cookbooks/package/libraries/config/roles/application.rb @@ -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 diff --git a/spec/chef/cookbooks/package/libraries/config/roles_spec.rb b/spec/chef/cookbooks/package/libraries/config/roles_spec.rb --- a/spec/chef/cookbooks/package/libraries/config/roles_spec.rb +++ b/spec/chef/cookbooks/package/libraries/config/roles_spec.rb @@ -95,8 +95,17 @@ 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 + + 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