From 47197c7f64714927630e48a49c4430b7a1b8cd5c Mon Sep 17 00:00:00 2001 From: Arthur Wolf Date: Mon, 11 Jul 2022 01:23:58 +0200 Subject: [PATCH 1/3] header --- docs/src/how-to/install/configuration-options.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/src/how-to/install/configuration-options.rst b/docs/src/how-to/install/configuration-options.rst index 6948089542..0b87eb45d2 100644 --- a/docs/src/how-to/install/configuration-options.rst +++ b/docs/src/how-to/install/configuration-options.rst @@ -887,4 +887,8 @@ To change the TeamSearchVisibilityInbound to SearchableByOwnTeam for the team ru curl -XPUT -H 'Content-Type: application/json' -d "{\"status\": \"disabled\"}" http://localhost:9000/i/teams/dcbedf9a-af2a-4f43-9fd5-525953a919e1/features/searchVisibilityInbound - \ No newline at end of file + + +Configuring classified domains +------------------------------ + From daf6bc0a6632f45796e3b4de3c9529cfe421ffbd Mon Sep 17 00:00:00 2001 From: Arthur Wolf Date: Mon, 11 Jul 2022 01:25:42 +0200 Subject: [PATCH 2/3] add classified domains info --- .../src/how-to/install/configuration-options.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/src/how-to/install/configuration-options.rst b/docs/src/how-to/install/configuration-options.rst index 0b87eb45d2..0d125bfff5 100644 --- a/docs/src/how-to/install/configuration-options.rst +++ b/docs/src/how-to/install/configuration-options.rst @@ -892,3 +892,19 @@ To change the TeamSearchVisibilityInbound to SearchableByOwnTeam for the team ru Configuring classified domains ------------------------------ + + +.. code:: yaml + + galley: + replicaCount: 1 + config: + ... + featureFlags: + ... + classifiedDomains: + status: enabled + config: + domains: ["domain-that-is-classified.link"] + ... + From 1a7c0afe98785c9f028be0f0bd7ba2d3278ec429 Mon Sep 17 00:00:00 2001 From: Arthur Wolf Date: Mon, 11 Jul 2022 01:39:24 +0200 Subject: [PATCH 3/3] add table of configurations --- .../how-to/install/configuration-options.rst | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/docs/src/how-to/install/configuration-options.rst b/docs/src/how-to/install/configuration-options.rst index 0d125bfff5..a16df6e641 100644 --- a/docs/src/how-to/install/configuration-options.rst +++ b/docs/src/how-to/install/configuration-options.rst @@ -892,7 +892,9 @@ To change the TeamSearchVisibilityInbound to SearchableByOwnTeam for the team ru Configuring classified domains ------------------------------ +As a backend administrator, if you want to control which other backends (identified by their domain) are "classified", +change the following `galley` configuration in the `value.yaml.gotmpl` file of the wire-server chart: .. code:: yaml @@ -908,3 +910,31 @@ Configuring classified domains domains: ["domain-that-is-classified.link"] ... +This is not only a `backend` configuration, but also a `team` configuration/feature. + +This means that different combinations of configurations will have different results. + +Here is a table to navigate the possible configurations: + ++----------------------------------+---------------------------------------------+-------------------------------+------------------------+---------------------------------+ +| Backend Config enabled/disabled | Backend Config Domains | Team Config enabled/disabled | Team Config Domains | User's view | ++==================================+=============================================+===============================+========================+=================================+ +| Enabled | [domain1.example.com] | Not configured | Not configured | Enabled, [domain1.example.com] | ++----------------------------------+---------------------------------------------+-------------------------------+------------------------+---------------------------------+ +| Enabled | [domain1.example.com][domain1.example.com] | Enabled | Not configured | Enabled, [domain1.example.com] | ++----------------------------------+---------------------------------------------+-------------------------------+------------------------+---------------------------------+ +| Enabled | [domain1.example.com] | Enabled | [domain2.example.com] | Enabled, Undefined | ++----------------------------------+---------------------------------------------+-------------------------------+------------------------+---------------------------------+ +| Enabled | [domain1.example.com] | Disabled | Anything | Undefined | ++----------------------------------+---------------------------------------------+-------------------------------+------------------------+---------------------------------+ +| Disabled | Anything | Not configured | Not configured | Disabled, no domains | ++----------------------------------+---------------------------------------------+-------------------------------+------------------------+---------------------------------+ +| Disabled | Anything | Enabled | [domain2.example.com] | Undefined | ++----------------------------------+---------------------------------------------+-------------------------------+------------------------+---------------------------------+ + +The table assumes the following: + +* When backend level config says that this feature is enabled, it is illegal to not specify domains at the backend level. +* When backend level config says that this feature is disabled, the list of domains is ignored. +* When team level feature is disabled, the accompanying domains are ignored. +