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

Added new disable cloud config setting for self-hosted deployments #7012

Merged
merged 22 commits into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7ee7022
Update conf.py
amyblais Mar 15, 2024
118113a
Merge branch 'master' into v9.7-documentation
amyblais Mar 15, 2024
79acf46
Update download-latest-tarball.rst
amyblais Mar 15, 2024
c268ef3
Update download-latest-tarball.rst
amyblais Mar 15, 2024
8248027
Update download-latest-tarball.rst
amyblais Mar 15, 2024
9ce49dc
Merge branch 'master' into v9.7-documentation
amyblais Mar 19, 2024
09e9150
Merge branch 'master' into v9.7-documentation
amyblais Mar 19, 2024
f5b5136
Merge branch 'master' into v9.7-documentation
amyblais Mar 19, 2024
4830338
Merge branch 'master' into v9.7-documentation
amyblais Mar 19, 2024
4274631
Update download-latest-tarball.rst
amyblais Mar 19, 2024
355fc09
Merge branch 'master' into v9.7-documentation
amyblais Mar 19, 2024
4d59aa0
Merge branch 'master' into v9.7-documentation
amyblais Mar 21, 2024
107a03d
Merge branch 'master' into v9.7-documentation
amyblais Mar 22, 2024
b18ba9e
Merge branch 'master' into v9.7-documentation
amyblais Mar 25, 2024
6e80e27
Merge branch 'master' into v9.7-documentation
amyblais Mar 25, 2024
96f8371
Merge branch 'master' into v9.7-documentation
amyblais Mar 27, 2024
9c52439
Corrected config setting name for onboarding flow (#7006)
cwarnermm Mar 28, 2024
9d70857
Merge branch 'master' into v9.7-documentation
amyblais Mar 28, 2024
d0920fe
Added new disable cloud config setting for self-hosted deployments
cwarnermm Mar 28, 2024
b400068
Incorporated reviewer feedback
cwarnermm Apr 9, 2024
0a5c2e7
Merge branch 'master' into disable-cloud-config
cwarnermm Apr 16, 2024
1eafd48
Merge branch 'master' into disable-cloud-config
cwarnermm Apr 16, 2024
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
4 changes: 2 additions & 2 deletions source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -3358,9 +3358,9 @@ def setup(_: Sphinx):
# built documents.
#
# The short X.Y version.
# version = '9.6'
# version = '9.7'
# The full version, including alpha/beta/rc tags.
# release = '9.6'
# release = '9.7'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
32 changes: 31 additions & 1 deletion source/configure/environment-configuration-settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,34 @@ Developer
:start-after: :nosearch:

.. include:: developer-mode-configuration-settings.rst
:start-after: :nosearch:
:start-after: :nosearch:

Cloud settings
--------------

.. config:setting:: cloud-disable
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cloud admins can't change this - only work sin self hosted

:displayname: Disable customer portal requests (Cloud)
:systemconsole: N/A
:configjson: .CloudSettings.Disable
:environment: MM_CLOUDSETTINGS_DISABLE
:description: Enable or disable server requests to the Mattermost Customer Portal.

- **true**: Server-side requests made to the customer portal are enabled, but will always fail in air-gapped and restricted environments.
- **false**: **(Default)** Server-side requests made to the customer portal are disabled.

Disable Customer Portal requests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+-----------------------------------------------+---------------------------------------------------------------------------+
| Enable or disable developer mode. | - System Config path: **N/A** |
| | - ``config.json setting``: ``".CloudSettings.Disable": false",`` |
| - **true**: Server-side requests made to the | - Environment variable: ``MM_CLOUDSETTINGS_DISABLE`` |
| Mattermost Customer Portal are enabled, | |
| but will always fail in air-gapped and | |
| restricted deployment environments. | |
| - **false**: **(Default)** Server-side | |
| requests made to the customer portal are | |
| disabled. | |
+-----------------------------------------------+---------------------------------------------------------------------------+
| **Note**: Cloud admins can’t modify this configuration setting. |
+-----------------------------------------------+---------------------------------------------------------------------------+
12 changes: 6 additions & 6 deletions source/configure/experimental-configuration-settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -396,24 +396,24 @@ Enable tutorial
| This feature's ``config.json`` setting is ``"EnableTutorial": true`` with options ``true`` and ``false``. |
+--------------------------------------------------------------------------------------------------------------------------------------------+

.. config:setting:: exp-enableonboarding
:displayname: Enable onboarding (Experimental)
.. config:setting:: exp-enableonboardingflow
:displayname: Enable onboarding flow (Experimental)
:systemconsole: Experimental > Features
:configjson: EnableOnboarding
:configjson: EnableOnboardingFlow
:environment: N/A

- **true**: **(Default)** New Mattermost users are shown key tasks to complete as part of initial onboarding.
- **false**: User onboarding tasks are disabled. Users are placed in Town Square when they open Mattermost for the first time after account creation.

Enable onboarding
~~~~~~~~~~~~~~~~~
Enable onboarding flow
~~~~~~~~~~~~~~~~~~~~~~

**True**: New Mattermost users are shown key tasks to complete as part of initial onboarding.

**False**: User onboarding tasks are disabled. Users are placed in Town Square when they open Mattermost for the first time after account creation.

+--------------------------------------------------------------------------------------------------------------------------------------------+
| This feature's ``config.json`` setting is ``"EnableOnboarding": true`` with options ``true`` and ``false``. |
| This feature's ``config.json`` setting is ``"EnableOnboardingFlow": true`` with options ``true`` and ``false``. |
+--------------------------------------------------------------------------------------------------------------------------------------------+

.. config:setting:: exp-enableusertypingmessages
Expand Down
2 changes: 1 addition & 1 deletion source/install/download-latest-tarball.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Using ``wget``, download the Mattermost Server release you want to install.

<div class="mm-code-copy__wrapper">
<code class="mm-code-copy__text mm-code-copy__trigger" data-click-el="Snippet">
wget https://releases.mattermost.com/9.6.1/mattermost-9.6.1-linux-amd64.tar.gz
wget https://releases.mattermost.com/9.7.0/mattermost-9.7.0-linux-amd64.tar.gz
</code>
<span class="mm-code-copy__copied-notice">Copied to clipboard</span>
</div>
Expand Down
Loading