Merge branch 'sh-fix-mattermost-log-location' into 'master'

Fix mattermost log location

Closes #2718

See merge request !1881

CHANGELOG.md

@@ -8,6 +8,9 @@ omnibus-gitlab repository.
   * Saves users from manually editing gitlab.rb just to set the URL and hence
     makes installation process easier
 
+9.5.2
+- Fix Mattermost log location
+
 9.5.0
 
 - Fix the NGINX configuration for GitLab Pages with Cache-Control headers 2242884e

files/gitlab-config-template/gitlab.rb.template

@@ -1095,7 +1095,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # mattermost['sql_query_timeout'] = 30
 
 
-# mattermost['log_file_directory'] = '/var/log/gitlab/mattermost'
+# mattermost['log_file_directory'] = '/var/log/gitlab/mattermost/'
 # mattermost['log_console_enable'] = true
 # mattermost['log_console_level'] = 'INFO'
 # mattermost['log_enable_file'] = false

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -677,7 +677,7 @@ default['gitlab']['mattermost']['home'] = '/var/opt/gitlab/mattermost'
 default['gitlab']['mattermost']['database_name'] = 'mattermost_production'
 default['gitlab']['mattermost']['env'] = {}
 
-default['gitlab']['mattermost']['log_file_directory'] = '/var/log/gitlab/mattermost'
+default['gitlab']['mattermost']['log_file_directory'] = '/var/log/gitlab/mattermost/'
 default['gitlab']['mattermost']['log_console_enable'] = true
 default['gitlab']['mattermost']['log_enable_webhook_debugging'] = true
 default['gitlab']['mattermost']['log_console_level'] = 'INFO'

files/gitlab-cookbooks/gitlab/templates/default/config.json.erb

@@ -71,7 +71,7 @@
         "EnableFile": <%= @log_enable_file %>,
         "FileLevel": "<%= @log_file_level %>",
         "FileFormat": "<%= @log_file_format %>",
-        "FileLocation": "<%= @log_file_directory %>/mattermost.log",
+        "FileLocation": "<%= @log_file_directory %>",
         "EnableDiagnostics": <%= @log_enable_diagnostics %>
     },
     "FileSettings": {