Merge pull request #261201 from vojta001/firefox-sync

nixos/firefox-syncserver: fix and update the docs and options descriptions
This commit is contained in:
pennae 2023-10-15 15:53:05 +02:00 committed by GitHub
commit 3d94e754d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -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. accessed. The `url` can be configured automatically when using nginx.
Options that affect the surroundings of the sync server are `enableNginx`, 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 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 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 enable ACME certificates on the new virtual host and force all connections to

View file

@ -224,10 +224,12 @@ in
Settings for the sync server. These take priority over values computed Settings for the sync server. These take priority over values computed
from NixOS options. from NixOS options.
See the doc comments on the `Settings` structs in See the example config in
<https://github.com/mozilla-services/syncstorage-rs/blob/master/syncstorage/src/settings.rs> <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 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. for available options.
''; '';
}; };