diff options
| author | Vojtěch Káně <vojtech.kane@gmail.com> | 2023-10-15 13:33:40 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-10-15 13:53:38 +0000 |
| commit | 4cd2377e633797e83b5fedd3c18338941320a4c5 (patch) | |
| tree | 3a22a179e1d132d1d7a0135fed3c8ce875f4e092 | |
| parent | Merge #261164: nixos/release: fixup eval of tested job (diff) | |
| download | nixpkgs-4cd2377e633797e83b5fedd3c18338941320a4c5.tar.gz | |
nixos/firefox-syncserver: fix and update the docs and options descriptions
(cherry picked from commit b8624bd3125a73de37f4d9aa4704a99032f9188e)
| -rw-r--r-- | nixos/modules/services/networking/firefox-syncserver.md | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/firefox-syncserver.nix | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/firefox-syncserver.md b/nixos/modules/services/networking/firefox-syncserver.md index 3ee863343ece..4d8777d204bb 100644 --- a/nixos/modules/services/networking/firefox-syncserver.md +++ b/nixos/modules/services/networking/firefox-syncserver.md @@ -45,7 +45,7 @@ this instance, and `url`, which holds the URL under which the sync server can be accessed. The `url` can be configured automatically when using nginx. Options that affect the surroundings of the sync server are `enableNginx`, -`enableTLS` and `hostnam`. If `enableNginx` is set the sync server module will +`enableTLS` and `hostname`. If `enableNginx` is set the sync server module will automatically add an nginx virtual host to the system using `hostname` as the domain and set `url` accordingly. If `enableTLS` is set the module will also enable ACME certificates on the new virtual host and force all connections to diff --git a/nixos/modules/services/networking/firefox-syncserver.nix b/nixos/modules/services/networking/firefox-syncserver.nix index 42924d7f6993..71eb2f537acc 100644 --- a/nixos/modules/services/networking/firefox-syncserver.nix +++ b/nixos/modules/services/networking/firefox-syncserver.nix @@ -224,10 +224,12 @@ in Settings for the sync server. These take priority over values computed from NixOS options. - See the doc comments on the `Settings` structs in - <https://github.com/mozilla-services/syncstorage-rs/blob/master/syncstorage/src/settings.rs> + See the example config in + <https://github.com/mozilla-services/syncstorage-rs/blob/master/config/local.example.toml> + and the doc comments on the `Settings` structs in + <https://github.com/mozilla-services/syncstorage-rs/blob/master/syncstorage-settings/src/lib.rs> and - <https://github.com/mozilla-services/syncstorage-rs/blob/master/syncstorage/src/tokenserver/settings.rs> + <https://github.com/mozilla-services/syncstorage-rs/blob/master/tokenserver-settings/src/lib.rs> for available options. ''; }; |