diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-04 18:01:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-04 18:01:44 +0000 |
| commit | 20bee66ec8019437a47815f8e17b24d968a6aa4d (patch) | |
| tree | dc9c5da2cd5c6c1344b5cbedbba58764e6e4bbc9 /nixos/doc | |
| parent | cca97be2f01d5d8a17a8880ae35c79d22af27a2a (diff) | |
| parent | 7482ab623ef7f5d9134bbb575246f4249b035f3b (diff) | |
Merge staging-next into staging
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 8 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 |
2 files changed, 10 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 cc87b32e460b..743384f2ffc3 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 @@ -1756,6 +1756,14 @@ Superuser created successfully. </listitem> <listitem> <para> + A new option + <literal>services.prometheus.enableReload</literal> has been + added which can be enabled to reload the prometheus service + when its config file changes instead of restarting. + </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 21efb2e44de5..18e61c230c96 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -497,6 +497,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `cawbird` Twitter client now uses its own API keys to count as different application than upstream builds. This is done to evade application-level rate limiting. While existing accounts continue to work, users may want to remove and re-register their account in the client to enjoy a better user experience and benefit from this change. +- 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. + - 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 |