Merge pull request #8 from kjkeane/update-5.10.0

update to Mattermost 5.10.0
kjkeane · Apr 19, 2019 · 2feaf4b · 2feaf4b
2 parents 17eda98 + f118f18
commit 2feaf4b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+2019-04-19 - 5.10.0
+* Default to Mattermost 5.10.0
+* Add Experimental setting 'RestrictSystemAdmin'
+* Add Service setting 'MinimumHashtagLength'
+* Fix default values
 2019-03-18 - 5.9.0
 * Default to Mattermost 5.9.0
 * Switch Pillar to match Mattermost configuration values

diff --git a/mattermost/defaults.yaml b/mattermost/defaults.yaml
@@ -4,7 +4,7 @@
 
 mattermost:
   TeamSettings:
-    site-name: 'Mattermost'
+    SiteName: 'Mattermost'
   SqlSettings:
-    drivername: mysql
-    datasource: 'mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTime    out=30s&writeTimeout=30s'
+    DriverName: mysql
+    DataSource: 'mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTime    out=30s&writeTimeout=30s'
diff --git a/mattermost/osfingermap.yaml b/mattermost/osfingermap.yaml
@@ -2,7 +2,7 @@
 # vim: ft=yaml
 
 default:
-  version: '5.9.0'
+  version: '5.10.0'
   install_dir: '/opt'
   config_file: '/opt/mattermost/config/config.json'
   config_file_source: 'salt://mattermost/templates/mattermost.jinja'

diff --git a/mattermost/templates/mattermost.jinja b/mattermost/templates/mattermost.jinja
@@ -77,7 +77,8 @@
        "ExperimentalLimitClientConfig": {{ service.get('ExperimentalLimitClientConfig', 'false') }},
        "DisableLegacyMFA": {{ service.get('DisableLegacyMFA', 'false') }},
        "ExperimentalEmailInvitations": {{ service.get('ExperimentalEmailInvitation', 'false') }},
-       "ExperimentalLdapGroupSync": {{ service.get('ExperimentalLdapGroupSync', 'false') }}
+       "ExperimentalLdapGroupSync": {{ service.get('ExperimentalLdapGroupSync', 'false') }},
+       "MinimumHashtagLength": {{ service.get('MinimumHashtagLength', '3') }}
    },
 {% set team = mattermost.get('team-settings', {}) %}
    "TeamSettings": {
@@ -376,7 +377,8 @@
        "ClientSideCertEnable": {{ experimental.get('ClientSideCertEnable', 'false') }},
        "ClientSideCertCheck": "{{ experimental.get('ClientSideCertCheck', 'secondary') }}",
        "DisablePostMetadata": {{ experimental.get('DisablePostMetadata', 'false') }},
-       "LinkMetadataTimeoutMilliseconds": {{ experimental.get('LinkMetadataTimeoutMilliseconds', '5000') }}
+       "LinkMetadataTimeoutMilliseconds": {{ experimental.get('LinkMetadataTimeoutMilliseconds', '5000') }},
+       "RestrictSystemAdmin": {{ experimental.get('RestrictSystemAdmin', 'false') }}
    },
 {% set analytics = mattermost.get('AnalyticsSettings', {}) %}
    "AnalyticsSettings": {