Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v10.4 Docs #7667

Merged
merged 28 commits into from
Jan 16, 2025
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
efbe578
Update conf.py (#7666)
amyblais Dec 18, 2024
fbd25cc
Merge branch 'master' into v10.4-documentation
amyblais Dec 18, 2024
45df626
Merge branch 'master' into v10.4-documentation
amyblais Dec 18, 2024
f44ff00
Merge branch 'master' into v10.4-documentation
amyblais Jan 2, 2025
c9482b4
Merge branch 'master' into v10.4-documentation
amyblais Jan 6, 2025
6766dfb
Merge branch 'master' into v10.4-documentation
amyblais Jan 7, 2025
f4cc5c5
Fixed typo (#7679)
cwarnermm Jan 10, 2025
81484f4
Clarified team admin capabilities (#7681)
cwarnermm Jan 10, 2025
c441633
Added diagnostics file to Support Packet (#7682)
cwarnermm Jan 10, 2025
789780a
Added Enterprise-only About > Hostname (#7683)
cwarnermm Jan 10, 2025
a57d22f
Updated web & desktop notification prompt details (#7685)
cwarnermm Jan 10, 2025
881a793
Clarified min server version requirements (#7688)
cwarnermm Jan 10, 2025
710c117
Added Amazon S3 storage class config settings (#7691)
cwarnermm Jan 10, 2025
06c8466
Added WIP Locales config setting (#7690)
cwarnermm Jan 10, 2025
e87e100
Removed Slack theme import functionality (#7684)
cwarnermm Jan 10, 2025
a183dae
Added Redis config settings (#7689)
cwarnermm Jan 10, 2025
46852c3
Docs listening: Added clarity on how to access config settings in the…
cwarnermm Jan 10, 2025
b8b3ca9
Incorporated https://github.com/mattermost/docs/pull/7467
cwarnermm Jan 10, 2025
14a2d89
Merge branch 'master' into v10.4-documentation
cwarnermm Jan 10, 2025
9ae1cae
Broken link fixes
cwarnermm Jan 10, 2025
836bccb
Merge branch 'v10.4-documentation' of https://github.com/mattermost/d…
cwarnermm Jan 10, 2025
8ee98ea
Added emoji prefix recommendation for channels & channel categories (…
cwarnermm Jan 10, 2025
e77ae0c
Added scheduled maintenance comms guidance (#7696)
cwarnermm Jan 10, 2025
6d10809
Incorporated reviewer feedback
cwarnermm Jan 13, 2025
9d84314
v10.4 Changelog (#7664)
amyblais Jan 14, 2025
65e3f5b
Merge branch 'master' into v10.4-documentation
cwarnermm Jan 14, 2025
70e18a3
Merge branch 'master' into v10.4-documentation
amyblais Jan 15, 2025
4430334
Merge branch 'master' into v10.4-documentation
amyblais Jan 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Clarified min server version requirements (#7688)
  • Loading branch information
cwarnermm authored Jan 10, 2025
commit 881a793e7c13a6a859a875729f4295618ec0443d
10 changes: 7 additions & 3 deletions source/configure/site-configuration-settings.rst
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ Both self-hosted and Cloud admins can access the following configuration setting
- `File Sharing and Downloads <#file-sharing-and-downloads>`__
- `Public Links <#public-links>`__
- `Notices <#notices>`__
- `Connected Workspaces <#connected-workspaces>`__
- `Connected Workspaces (Beta) <#connected-workspaces-beta>`__

----

@@ -1802,6 +1802,7 @@ Connected workspaces (Beta)
:start-after: :nosearch:

The following settings aren't available in the System Console and can only be set in ``config.json``.

When connected workspaces are enabled, system admins can :doc:`create and manage connected workspaces </onboard/connected-workspaces>` in the System Console by going to **Site Configuration > Connected Workspaces (Beta)**.

.. config:setting:: enable-connected-workspaces
@@ -1814,8 +1815,11 @@ When connected workspaces are enabled, system admins can :doc:`create and manage
Enable connected workspaces (Beta)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Enable the ability to establish secure connections between Mattermost instances, and invite secured connections to shared channels where users can participate as they would in any public and private channel.
Both configuration settings are disabled by default and must be enabled in order to share channels with secure connections. Enabling connected workspace functionality requires a server restart.
Enable the ability to establish secure connections between Mattermost instances, and invite secured connections to shared channels where users can participate as they would in any public and private channel.

Connected workspaces requires Mattermost Enterprise servers running v10.2 or later.

By default, both configuration settings are disabled and must be enabled in order to share channels with secure connections. Enabling connected workspace functionality requires a server restart.

This feature's two ``config.json`` settings include:

12 changes: 7 additions & 5 deletions source/onboard/connected-workspaces.rst
Original file line number Diff line number Diff line change
@@ -13,15 +13,17 @@ A channel’s permissions and access continues to be governed by each server sep
Set up connected workspaces
---------------------------

The process of connecting Mattermost workspaces involves the following 4 steps:
The process of connecting Mattermost workspaces involves the following 5 steps:

1. Each system admin of a Mattermost instance who wants to connect to another Mattermost workspaces must `enable the connected workflows functionality <#enable-connected-workflows>`__.
1. Ensure that all Mattermost Enterprise servers are running v10.2 or later.

2. Using the System Console or slash commands, system admins `create a secure and trusted connection <#create-a-secure-connection>`__ with other Mattermost Enterprise instances. This process involves creating a password-protected, encrypted invitation, creating a strong decryption password, then sending the invitation and password to the system admin of a remote Mattermost instance.
2. `Enable the connected workflows functionality <#enable-connected-workflows>`__ for each Mattermost Enterprise instance you want to connect.

3. Using the System Console or slash commands, a remote system admin receives the invitation and `accepts the invitation <#accept-a-secure-connection-invitation>`__.
3. System admins must `create a secure and trusted connection <#create-a-secure-connection>`__ with other Mattermost Enterprise instances using the System Console or slash commands. This process involves creating a password-protected, encrypted invitation, creating a strong decryption password, then sending the invitation and password to the system admin of a remote Mattermost instance.

4. Once a trusted relationship is established between 2 Mattermost servers, system admins can `share specific public or private channels <#share-channels-with-secure-connections>`__ with secure connections.
4. When a remote system admin receives the invitation, they must `accept the invitation <#accept-a-secure-connection-invitation>`__ using the System Console or slash commands.

5. Once a trusted relationship is established between 2 Mattermost servers, system admins can `share specific public or private channels <#share-channels-with-secure-connections>`__ with secure connections.

.. note::

Loading