diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-08 18:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 18:01:24 +0000 |
| commit | f14d7cb2f666e85da4e69c9b8b1e8c24860cf91c (patch) | |
| tree | 72f48cbc6b62cbb38c847d268cbff1d5782c4a93 /nixos/doc/manual/release-notes/rl-2111.section.md | |
| parent | 40b71c3159786e26785d0fbda27f0e2042c7f764 (diff) | |
| parent | 159ed1e4f00b1a4dfe06881f27cb7d3ffe7d3ec3 (diff) | |
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual/release-notes/rl-2111.section.md')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 39663720eb6e..7567c7d64393 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -510,6 +510,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, 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. - The "${hostname}" option has been deprecated, please use `dokuwiki.sites = [ "${hostname}" ]` instead |