summaryrefslogtreecommitdiffstats
path: root/nixos/doc
diff options
context:
space:
mode:
authorBas van Dijk <bas@van.dijk.ch>2021-11-07 14:45:40 +0000
committerBas van Dijk <bas@van.dijk.ch>2021-11-07 14:45:40 +0000
commit0e4abb0df773cf7d9ff8dc2792358c0b8508d5eb (patch)
tree6f5522bfd1bf27f3d39d4a3f6cc763b78d8e6ee1 /nixos/doc
parentdd1edacb7bb7d60af46467c1d27c1c457d33210b (diff)
nixos/prometheus: remove services.prometheus.environmentFile
The option `services.prometheus.environmentFile` has been removed since it was causing [issues](https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files.
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml9
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
2 files changed, 11 insertions, 0 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index e5e7c112c617..ebf4bd2bd5e5 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1805,6 +1805,15 @@ Superuser created successfully.
</listitem>
<listitem>
<para>
+ The option
+ <literal>services.prometheus.environmentFile</literal> has
+ been removed since it was causing
+ <link xlink:href="https://github.com/NixOS/nixpkgs/issues/126083">issues</link>
+ and Prometheus now has native support for secret files.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
Dokuwiki now supports caddy! However
</para>
<itemizedlist spacing="compact">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 144e08340157..c0b12b479a22 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -508,6 +508,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- A new option `services.prometheus.enableReload` has been added which can be enabled to reload the prometheus service when its config file changes instead of restarting.
+- The option `services.prometheus.environmentFile` has been removed since it was causing [issues](https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files.
+
- Dokuwiki now supports caddy! However
- the nginx option has been removed, in the new configuration, please use the `dokuwiki.webserver = "nginx"` instead.
- The "${hostname}" option has been deprecated, please use `dokuwiki.sites = [ "${hostname}" ]` instead