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

Merge branch 'jv-gitaly-logrotate' into 'master'

Ensure logrotate is on by default for gitaly/*.log

See merge request gitlab-org/omnibus-gitlab!4684
parents 49777755 b1fa4abb
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -822,7 +822,7 @@ default['gitlab']['logrotate']['enable'] = false
default['gitlab']['logrotate']['ha'] = false
default['gitlab']['logrotate']['dir'] = "/var/opt/gitlab/logrotate"
default['gitlab']['logrotate']['log_directory'] = "/var/log/gitlab/logrotate"
default['gitlab']['logrotate']['services'] = %w(nginx puma actioncable unicorn gitlab-rails gitlab-shell gitlab-workhorse gitlab-pages gitlab-kas)
default['gitlab']['logrotate']['services'] = %w(nginx puma actioncable unicorn gitlab-rails gitlab-shell gitlab-workhorse gitlab-pages gitlab-kas gitaly)
default['gitlab']['logrotate']['pre_sleep'] = 600 # sleep 10 minutes before rotating after start-up
default['gitlab']['logrotate']['post_sleep'] = 3000 # wait 50 minutes after rotating
 
Loading
Loading
Loading
Loading
@@ -58,6 +58,7 @@ RSpec.describe 'gitlab::logrotate_folder_and_configs_spec' do
expect(chef_run).to create_template('/var/opt/gitlab/logrotate/logrotate.d/gitlab-shell')
expect(chef_run).to create_template('/var/opt/gitlab/logrotate/logrotate.d/gitlab-workhorse')
expect(chef_run).to create_template('/var/opt/gitlab/logrotate/logrotate.d/gitlab-pages')
expect(chef_run).to create_template('/var/opt/gitlab/logrotate/logrotate.d/gitaly')
end
 
it 'populates configuration template with default values' do
Loading
Loading
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