diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2022-05-27 12:00:00 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-05-27 17:40:49 +0000 |
| commit | 09e3091aaefd9fb43cecf9524352955574bd7bc4 (patch) | |
| tree | 8b83cdb0a808cdbcfc607e2db67affc717ea0fbd | |
| parent | Merge pull request #174602 from NixOS/backport-174222-to-release-22.05 (diff) | |
| download | nixpkgs-origin/backport-174906-to-release-22.05.tar.gz | |
release-notes: don't encourage people to copy secrets to the storeorigin/backport-174906-to-release-22.05
(cherry picked from commit 2fdd23c154e28d3d735c84585914fb9f2277eac6)
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 6 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2205.section.md | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index b291d38da671..92a859fe94ed 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -919,7 +919,7 @@ }; extraConfigFiles = [ - /run/keys/matrix-synapse/secrets.yaml + "/run/keys/matrix-synapse/secrets.yaml" ]; }; } @@ -927,7 +927,9 @@ <para> The secrets in your original config should be migrated into a YAML file that is included via - <literal>extraConfigFiles</literal>. + <literal>extraConfigFiles</literal>. The filename must be + quoted to prevent nix from copying it to the (world readable) + store. </para> <para> Additionally a few option defaults have been synced up with diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 4f4643e505bc..19695a0bceab 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -368,13 +368,13 @@ In addition to numerous new and upgraded packages, this release has the followin }; extraConfigFiles = [ - /run/keys/matrix-synapse/secrets.yaml + "/run/keys/matrix-synapse/secrets.yaml" ]; }; } ``` - The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`. + The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`. The filename must be quoted to prevent nix from copying it to the (world readable) store. Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`. For the same reason, the default `media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new |