Merge branch 'gitlab-shell-remote-syslog' into 'master'

Also transmit gitlab-shell logs with remote_syslog

For some reason we forgot to add gitlab-shell to the list of directories under `/var/log/gitlab` monitored by remote-syslog.

See merge request !370
This commit is contained in:
Marin Jankovski 2015-06-11 13:31:55 +00:00
commit 9242b83525
1 changed files with 1 additions and 1 deletions

View File

@ -350,7 +350,7 @@ default['gitlab']['remote-syslog']['dir'] = "/var/opt/gitlab/remote-syslog"
default['gitlab']['remote-syslog']['log_directory'] = "/var/log/gitlab/remote-syslog"
default['gitlab']['remote-syslog']['destination_host'] = "localhost"
default['gitlab']['remote-syslog']['destination_port'] = 514
default['gitlab']['remote-syslog']['services'] = %w{redis nginx unicorn gitlab-rails postgresql sidekiq ci-redis ci-unicorn ci-sidekiq}
default['gitlab']['remote-syslog']['services'] = %w{redis nginx unicorn gitlab-rails gitlab-shell postgresql sidekiq ci-redis ci-unicorn ci-sidekiq}
###
# Logrotate