Merge branch '8-17-stable' into 8-17-stable-ee

* 8-17-stable:
  Merge branch 'upgrade_mysql' into 'master'
  Merge branch 'mattermost_site_url_settings' into 'master'

config/software/mysql-client.rb

@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-name "mysql-client"
-default_version "5.5.54"
+name 'mysql-client'
+default_version '5.5.56'
 license "GPL-2.0"
 license_file "COPYING"
@@ -27,7 +27,7 @@ dependency "zlib"
 dependency "ncurses"
 source  url: "http://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-#{version}.tar.gz",
-        md5: "358b596e62699397aeee3dfb469f5823"
+        md5: '76a393f1aee0d57bf71e1a7414200233'
 relative_path "mysql-#{version}"

doc/gitlab-mattermost/README.md

@@ -9,9 +9,9 @@ Make sure you view this guide from the tag (version) of GitLab you would like to
 If the highest number stable branch is unclear please check the [GitLab Blog](https://about.gitlab.com/blog/) for installation guide links by version.
-## Pre-requisite 
-GitLab Mattermost is compiled and manually tested each release on an AMD 64 chipset for Linux. ARM chipsets and operating systems, like Raspberry PI, are not supported. 
+## Pre-requisite
+GitLab Mattermost is compiled and manually tested each release on an AMD 64 chipset for Linux. ARM chipsets and operating systems, like Raspberry PI, are not supported.
 ## Getting started
@@ -110,7 +110,6 @@ mattermost_external_url 'https://mattermost.gitlab.example'
 mattermost_nginx['redirect_http_to_https'] = true
 mattermost_nginx['ssl_certificate'] = "/etc/gitlab/ssl/mattermost-nginx.crt"
 mattermost_nginx['ssl_certificate_key'] = "/etc/gitlab/ssl/mattermost-nginx.key"
-mattermost['service_site_url'] = "https://mattermost.gitlab.example"
 mattermost['service_use_ssl'] = true
 ```
@@ -177,15 +176,15 @@ For help and support around your GitLab Mattermost deployment please see:
 ## Upgrading GitLab Mattermost
 Note: These upgrade instructions are for GitLab Version 8.9 (Mattermost v3.1.0) and above. For upgrading versions prior to GitLab 8.9, [additional steps are required](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc//gitlab-mattermost/README.md#upgrading-gitlab-mattermost-from-versions-prior-to-89).  
-  
+
 | GitLab Version | Mattermost Version |
 |----------------|--------------------|
 | 8.9            | v3.1.0             |
 | 8.10           | v3.2.0             |
 | 8.11           | v3.3.0             |
 | 8.12           | v3.4.0             |  
-  
-It is possible to skip upgrade versions starting from Mattermost v3.1. For example, Mattermost v3.1.0 in GitLab 8.9 can upgrade directly to Mattermost v3.4.0 in GitLab 8.12. 
+
+It is possible to skip upgrade versions starting from Mattermost v3.1. For example, Mattermost v3.1.0 in GitLab 8.9 can upgrade directly to Mattermost v3.4.0 in GitLab 8.12.
 GitLab Mattermost can be upgraded through the regular GitLab omnibus update process provided Mattermost configuration settings have not been changed outside of GitLab. This means no changes to Mattermost's `config.json` file have been made, either directly or via the Mattermost **System Console** which saves back changes to `config.json`.

files/gitlab-cookbooks/gitlab/libraries/gitlab_mattermost.rb

@@ -36,6 +36,7 @@ module GitlabMattermost
       end
       Gitlab['mattermost']['host'] = uri.host
+      Gitlab['mattermost']['service_site_url'] ||= Gitlab['mattermost_external_url']
       case uri.scheme
       when "http"

spec/chef/recipes/mattermost_spec.rb

@@ -10,6 +10,26 @@ describe 'gitlab::mattermost' do
     allow_any_instance_of(PgHelper).to receive(:database_exists?).and_return(true)
   end
+  context 'SiteUrl setting' do
+    it 'is set when mattermost_external_url is set' do
+      expect(chef_run).to render_file('/var/opt/gitlab/mattermost/config.json')
+        .with_content(%r{"SiteURL": "http://mattermost.example.com",})
+    end
+
+    context 'when explicitly set' do
+      before do
+        stub_gitlab_rb(mattermost: {
+                         service_site_url: 'http://mattermost.gitlab.example'
+                       })
+      end
+
+      it 'is not overriden by mattermost_external_url' do
+        expect(chef_run).to render_file('/var/opt/gitlab/mattermost/config.json')
+          .with_content(%r{"SiteURL": "http://mattermost.gitlab.example",})
+      end
+    end
+  end
+
   it 'authorizes mattermost with gitlab' do
     stub_gitlab_rb(external_url: 'http://external.url')
     allow(MattermostHelper).to receive(:authorize_with_gitlab)