Merge branch 'matermost-3-6-update' into 'master'

Updating GitLab Mattermost to 3.6 for GitLab 8.16 release

See merge request !1233

CHANGELOG.md

@@ -7,6 +7,7 @@ omnibus-gitlab repository.
 
 - Update git to 2.10.2 27cde301
 - Allow users to specify an initial shared runner registration token
+- Update Mattermost to version 3.6
 - Include Prometheus and Node Exporter, off by default
 - Let uses expose Mattermost host if installed on other server
 

config/software/mattermost.rb

@@ -17,10 +17,10 @@
 #
 
 name "mattermost"
-default_version "3.5.1"
+default_version "3.6.0"
 
 source url: "https://releases.mattermost.com/#{version}/mattermost-team-#{version}-linux-amd64.tar.gz",
-       md5: '0c8e5a678319093a36794af392aceccb'
+       md5: 'cdfaeb4471d4f1c69cbd5a0ceeb4d284'
 
 relative_path "mattermost"
 

files/gitlab-cookbooks/gitlab/templates/default/sv-mattermost-run.erb

@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 cd /opt/gitlab/embedded/service/mattermost
-exec chpst -P -U <%= node['gitlab']['mattermost']['username'] %> -u <%= node['gitlab']['mattermost']['username'] %> /opt/gitlab/embedded/bin/mattermost -config <%= node['gitlab']['mattermost']['home'] %>/config.json
+exec chpst -P -U <%= node['gitlab']['mattermost']['username'] %> -u <%= node['gitlab']['mattermost']['username'] %> /opt/gitlab/embedded/bin/mattermost --config <%= node['gitlab']['mattermost']['home'] %>/config.json