about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorTrolli Schmittlauch <t.schmittlauch+nixos@orlives.de>2023-11-28 00:49:16 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-12-04 15:04:59 +0000
commit6271842eb19166b66d5b42b4fe2856b46afa0535 (patch)
tree6a352ead702cc4ef619a98702a5526e98dec0648 /nixos
parent99912f9b525a486dcd27ce0a6b646993d13e18f6 (diff)
nixos/mastodon: clarify the need to set streamingProcesses
Explicitly declaring that option is now necessary, but wasn't in the module shipped with 23.05.

(cherry picked from commit cbf69c83d3b2bdc5eca341aa9e44e0406794af81)
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-2311.section.md4
-rw-r--r--nixos/modules/services/web-apps/mastodon.nix2
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index 09563ddb451f4..8491a3d50b826 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -71,7 +71,9 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
 - `services.mastodon` doesn't support providing a TCP port to its `streaming`
   component anymore, as upstream implemented parallelization by running
   multiple instances instead of running multiple processes in one instance.
-  Please create a PR if you are interested in this feature.
+  Please create a PR if you are interested in this feature.\
+  Due to this, the desired number of such instances
+  {option}`services.mastodon.streamingProcesses` now needs to be declared explicitly.
 
 - The `services.hostapd` module was rewritten to support `passwordFile` like
   options, WPA3-SAE, and management of multiple interfaces. This breaks
diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index 8686506b1c282..7b00ce35eb1a7 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -229,7 +229,7 @@ in {
       streamingProcesses = lib.mkOption {
         description = lib.mdDoc ''
           Number of processes used by the mastodon-streaming service.
-          Recommended is the amount of your CPU cores minus one.
+          Please define this explicitly, recommended is the amount of your CPU cores minus one.
         '';
         type = lib.types.ints.positive;
         example = 3;