Skip to content

Commit 4b10ce2

Browse files
committed
Upgrade Mattermost cookbook to support v5.2.1
- Close #37
1 parent ed9dbd7 commit 4b10ce2

File tree

7 files changed

+22
-6
lines changed

7 files changed

+22
-6
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
This file is used to list changes made in each version of the Mattermost cookbook.
44

5+
## v3.0.0 (2018.08.27)
6+
7+
- [#37](https://github.com/ist-dsi/mattermost-cookbook/issues/37) Update to Mattermost 5.2.1
8+
59
## v2.1.1 (2018.08.13)
610

711
- [#34](https://github.com/ist-dsi/mattermost-cookbook/issues/34) Update to Mattermost 5.1.1

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This cookbook installs and configures [Mattermost, the opensource Slack alternat
1010

1111
| Mattermost Version | Cookbook Version |
1212
|:------------------:|:----------------:|
13+
| 5.2.1 | v3.0.0 |
1314
| 5.1.1 | v2.1.1 |
1415
| 5.0.1 | v2.0.0 |
1516
| 4.10.1 | v1.6.10 |
@@ -40,7 +41,7 @@ Using this cookbook is relatively straightforward. It is recommended to create a
4041

4142
### Attributes
4243

43-
All settings are the [default settings](https://github.com/mattermost/mattermost-server/blob/v5.1.1/config/default.json) that come from [Mattermost repository](https://github.com/mattermost/mattermost-server/). Make sure to review them all and change what's necessary.
44+
All settings are the [default settings](https://github.com/mattermost/mattermost-server/blob/v5.2.1/config/default.json) that come from [Mattermost repository](https://github.com/mattermost/mattermost-server/). Make sure to review them all and change what's necessary.
4445

4546
## License and Authors
4647

attributes/app.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
'enforce_multifactor_authentication' => false,
3333
'enable_user_access_tokens' => false,
3434
'allow_cors_from' => '',
35+
'cors_exposed_headers' => '',
36+
'cors_allow_credentials' => false,
37+
'cors_debug' => false,
3538
'allow_cookies_for_subdomains' => false,
3639
'session_length_web_in_days' => 30,
3740
'session_length_mobile_in_days' => 30,
@@ -97,6 +100,8 @@
97100
'max_notifications_per_channel' => 1000,
98101
'enable_confirm_notifications_to_channel' => true,
99102
'teammate_name_display' => 'username',
103+
'experimental_view_archived_channels' => false,
104+
'experimental_default_channels' => '',
100105
'experimental_enable_automatic_replies' => false,
101106
'experimental_hide_town_square_in_lhs' => false,
102107
'experimental_town_square_is_read_only' => false,

attributes/mattermost.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
default['mattermost']['package'] = {
2-
'url' => 'https://releases.mattermost.com/5.1.1/mattermost-5.1.1-linux-amd64.tar.gz',
3-
'checksum' => '18ab8f43ebd2652cba946e0430399ed15e10ef44a3aca88e4467ea55da265ef4',
2+
'url' => 'https://releases.mattermost.com/5.2.1/mattermost-5.2.1-linux-amd64.tar.gz',
3+
'checksum' => '7acd675f3975a27a2d42b9244637947390481644ebb1860ab5a36882450a8fbc',
44
}
55

66
default['mattermost']['config'] = {

metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name 'mattermost-cookbook'
22
license 'Apache-2.0'
3-
version '2.1.1'
3+
version '3.0.0'
44

55
chef_version '>= 12.19'
66

spec/default_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
end
99

1010
it 'downloads and extracts' do
11-
expect(chef_run).to extract_tar_extract('https://releases.mattermost.com/5.1.1/mattermost-5.1.1-linux-amd64.tar.gz').with(
12-
checksum: '18ab8f43ebd2652cba946e0430399ed15e10ef44a3aca88e4467ea55da265ef4',
11+
expect(chef_run).to extract_tar_extract('https://releases.mattermost.com/5.2.1/mattermost-5.2.1-linux-amd64.tar.gz').with(
12+
checksum: '7acd675f3975a27a2d42b9244637947390481644ebb1860ab5a36882450a8fbc',
1313
target_dir: '/opt',
1414
user: 'mattermost',
1515
group: 'mattermost'

templates/default/config.json.erb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
"EnforceMultifactorAuthentication": <%= node['mattermost']['app']['service_settings']['enforce_multifactor_authentication'] %>,
3434
"EnableUserAccessTokens": <%= node['mattermost']['app']['service_settings']['enable_user_access_tokens'] %>,
3535
"AllowCorsFrom": "<%= node['mattermost']['app']['service_settings']['allow_cors_from'] %>",
36+
"CorsExposedHeaders": "<%= node['mattermost']['app']['service_settings']['cors_exposed_headers'] %>",
37+
"CorsAllowCredentials": <%= node['mattermost']['app']['service_settings']['cors_allow_credentials'] %>,
38+
"CorsDebug": <%= node['mattermost']['app']['service_settings']['cors_debug'] %>,
39+
"CorsAllowCredentials": <%= node['mattermost']['app']['service_settings']['allow_cookies_for_subdomains'] %>,
3640
"AllowCookiesForSubdomains": <%= node['mattermost']['app']['service_settings']['allow_cookies_for_subdomains'] %>,
3741
"SessionLengthWebInDays": <%= node['mattermost']['app']['service_settings']['session_length_web_in_days'] %>,
3842
"SessionLengthMobileInDays": <%= node['mattermost']['app']['service_settings']['session_length_mobile_in_days'] %>,
@@ -97,6 +101,8 @@
97101
"MaxNotificationsPerChannel": <%= node['mattermost']['app']['team_settings']['max_notifications_per_channel'] %>,
98102
"EnableConfirmNotificationsToChannel": <%= node['mattermost']['app']['team_settings']['enable_confirm_notifications_to_channel'] %>,
99103
"TeammateNameDisplay": "<%= node['mattermost']['app']['team_settings']['teammate_name_display'] %>",
104+
"ExperimentalViewArchivedChannels": <%= node['mattermost']['app']['team_settings']['experimental_view_archived_channels'] %>,
105+
"ExperimentalDefaultChannels": "<%= node['mattermost']['app']['team_settings']['experimental_default_channels'] %>",
100106
"ExperimentalEnableAutomaticReplies": <%= node['mattermost']['app']['team_settings']['experimental_enable_automatic_replies'] %>,
101107
"ExperimentalHideTownSquareinLHS": <%= node['mattermost']['app']['team_settings']['experimental_hide_town_square_in_lhs'] %>,
102108
"ExperimentalTownSquareIsReadOnly": <%= node['mattermost']['app']['team_settings']['experimental_town_square_is_read_only'] %>,

0 commit comments

Comments
 (0)