Skip to content

Commit

Permalink
Clarified min server version requirements (#7688)
Browse files Browse the repository at this point in the history
  • Loading branch information
cwarnermm authored Jan 10, 2025
1 parent a57d22f commit 881a793
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
10 changes: 7 additions & 3 deletions source/configure/site-configuration-settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>`__

----

Expand Down Expand Up @@ -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
Expand All @@ -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:

Expand Down
12 changes: 7 additions & 5 deletions source/onboard/connected-workspaces.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::

Expand Down

0 comments on commit 881a793

Please sign in to comment.