diff options
| author | Bas van Dijk <bas@van.dijk.ch> | 2021-11-07 19:04:24 +0000 |
|---|---|---|
| committer | Bas van Dijk <bas@van.dijk.ch> | 2021-11-07 19:04:24 +0000 |
| commit | 7f7780daa55e8f2de87acc7563078a3db85e7feb (patch) | |
| tree | 18b41b1faf524b12be96481f30a9252c9877189f /nixos/doc | |
| parent | 0e4abb0df773cf7d9ff8dc2792358c0b8508d5eb (diff) | |
nixos/prometheus: throw a helpful error when services.prometheus.environmentFile is defined
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 4 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 |
2 files changed, 4 insertions, 2 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 ebf4bd2bd5e5..d7dfcb5381cc 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 @@ -1809,7 +1809,9 @@ Superuser created successfully. <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. + 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> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index c0b12b479a22..1c737542e7d2 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -508,7 +508,7 @@ 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. +- 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, i.e. `basic_auth.password_file` and `authorization.credentials_file`. - Dokuwiki now supports caddy! However - the nginx option has been removed, in the new configuration, please use the `dokuwiki.webserver = "nginx"` instead. |