summary refs log tree commit diff
path: root/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-08 18:01:24 +0000
committerGitHub <noreply@github.com>2021-11-08 18:01:24 +0000
commitf14d7cb2f666e85da4e69c9b8b1e8c24860cf91c (patch)
tree72f48cbc6b62cbb38c847d268cbff1d5782c4a93 /nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
parent40b71c3159786e26785d0fbda27f0e2042c7f764 (diff)
parent159ed1e4f00b1a4dfe06881f27cb7d3ffe7d3ec3 (diff)
downloadnixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar
nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.gz
nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.bz2
nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.lz
nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.xz
nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.tar.zst
nixpkgs-f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual/from_md/release-notes/rl-2111.section.xml')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml11
1 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 2488f150248..e433029a381 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
@@ -1813,6 +1813,17 @@ 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, i.e.
+          <literal>basic_auth.password_file</literal> and
+          <literal>authorization.credentials_file</literal>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           Dokuwiki now supports caddy! However
         </para>
         <itemizedlist spacing="compact">