Merge branch 'mattermost_updates' into 'master'

Mattermost 1.2.1

Part of #942 

See merge request !537

config/software/mattermost.rb

@@ -17,10 +17,10 @@
 #
 
 name "mattermost"
-default_version "v1.2.0"
+default_version "v1.2.1"
 
 source url: "https://github.com/mattermost/platform/releases/download/#{version}/mattermost.tar.gz",
-       md5: '278741d1751c049b6cf298fe319ae6b0'
+       md5: '0bce907ee9f454499ee501ac274a8508'
 
 build do
   move "bin/platform", "#{install_dir}/embedded/bin/mattermost"

doc/gitlab-mattermost/README.md

@@ -129,4 +129,24 @@ Once the configuration is set, run `sudo gitlab-ctl reconfigure` for the changes
 ## GitLab Mattermost configuration
 
 For a complete list of available options, visit the [gitlab.rb.template](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template).
+
+Also see:
+
+### GitLab Mattermost Administrator's Guide
+
+The [GitLab Mattermost Administrator's Guide](https://github.com/mattermost/platform/blob/master/doc/install/Administration.md#gitlab-mattermost-administration) is maintained by the Mattermost community for GitLab users.
+
+#### GitLab Mattermost Trouble Shooting
+
+The [GitLab Mattermost Trouble Shooting](https://github.com/mattermost/platform/blob/master/doc/install/Administration.md#troubleshooting-gitlab-mattermost) section includes common error messages that may be encountered under different configurations as well as common solutions.
+
+#### Configuring Mattermost Incoming Webhooks
+
+See [the section on configuring incoming webhooks in Mattermost](https://github.com/mattermost/platform/blob/master/doc/install/Administration.md#connecting-mattermost-to-integrations-with-incoming-webhooks) to support Slack-equivalent notifications from GitLab, as well as for fully customizable alerting through the **GitLab Integration Service for Mattermost**.
+
+#### Configuring Mattermost Outgoing Webhooks
+
+See [the section on configuring outoing webhooks in Mattermost](https://github.com/mattermost/platform/blob/master/doc/install/Administration.md#connecting-mattermost-to-integrations-with-outgoing-webhooks) for connecting to Mattermost applications created by the Mattermost community for interactivity with systems like **Hubot** and **IRC**.
+
+
 We welcome contributions to improve the configuration settings explanations both in the gitlab.rb.template and in the documentation.

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

@@ -594,12 +594,12 @@ default['gitlab']['mattermost']['service_port'] = "8065"
 default['gitlab']['mattermost']['service_maximum_login_attempts'] = 10
 default['gitlab']['mattermost']['service_segment_developer_key'] = nil
 default['gitlab']['mattermost']['service_google_developer_key'] = nil
-default['gitlab']['mattermost']['service_enable_incoming_webhooks'] = true
+default['gitlab']['mattermost']['service_enable_incoming_webhooks'] = false
 default['gitlab']['mattermost']['service_enable_post_username_override'] = false
 default['gitlab']['mattermost']['service_enable_post_icon_override'] = false
 default['gitlab']['mattermost']['service_enable_testing'] = false
 default['gitlab']['mattermost']['service_enable_security_fix_alert'] = true
-default['gitlab']['mattermost']['service_enable_outgoing_webhooks'] = true
+default['gitlab']['mattermost']['service_enable_outgoing_webhooks'] = false
 
 
 default['gitlab']['mattermost']['sql_driver_name'] = 'postgres'

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

@@ -16,7 +16,7 @@
         "MaxUsersPerTeam": <%= @team_max_users_per_team %>,
         "EnableTeamCreation": <%= @team_enable_team_creation %>,
         "EnableUserCreation": <%= @team_enable_user_creation %>,
-        "RestrictCreationToDomains": "<%= @team_restrict_creation_to_domains %>,
+        "RestrictCreationToDomains": "<%= @team_restrict_creation_to_domains %>",
         "RestrictTeamNames": <%= @team_restrict_team_names %>,
         "EnableTeamListing": <%= @team_enable_team_listing %>
     },