Merge pull request #7219 from Icinga/feature/api-cipherlist

API: Harden default cipher list

diff --git a/doc/06-distributed-monitoring.md b/doc/06-distributed-monitoring.md
index f1697ae379c3991e15eb59ef4f52b80ad039e152..dca0aea9546e6934db6d46d7bcede87e8574595a 100644 (file)
--- a/doc/06-distributed-monitoring.md
+++ b/doc/06-distributed-monitoring.md
@@ -2155,6 +2155,10 @@ object Zone "global-commands" {
 
 The default global zones generated by the setup wizards are called `global-templates` and `director-global`.
 
+While you can should `global-templates` for your global configuration, `director-global` is reserved for use
+by [Icinga Director](https://icinga.com/docs/director/latest/). Please don't
+place any configuration in it manually.
+
 Similar to the zone configuration sync you'll need to create a new directory in
 `/etc/icinga2/zones.d`:
 

diff --git a/doc/17-language-reference.md b/doc/17-language-reference.md
index 9a606023822b1af53b067250893fbb5469f20cec..55c73ec58dcdc9aa893a44a397fb3fc18e79f238 100644 (file)
--- a/doc/17-language-reference.md
+++ b/doc/17-language-reference.md
@@ -756,6 +756,14 @@ When no pattern is specified the default pattern "*.conf" is used.
 
 ## Zone Includes <a id="zone-includes"></a>
 
+> **Note**
+>
+> This is an internal functionality consumed by Icinga itself.
+>
+> The preferred way for users managing configuration files in
+> zones is to use the [cluster config sync](06-distributed-monitoring.md#distributed-monitoring-top-down-config-sync)
+> or [REST API config packages](12-icinga2-api.md#icinga2-api-config-management).
+
 The `include_zones` recursively includes all subdirectories for the
 given path.