nixos/tor: add HiddenServiceVersion option #50950
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
type = types.addCheck (types.nullOr types.int) (x: x == 2 || x == 3);
I think it should be
type = types.nullOr (types.addCheck types.int (x: x == 2 || x == 3));
(Btw, grepping shows `nixos/modules/services/misc/rippled.nix` does a similar wrong thing. I fixed that one myself and added the patch to the queue.)
Also, after reading #50849 (review) I'm now also a bit torn on whenever the default should be left to tor via `null`s, via `isDefined` or at all. But I'd say it's fine as it is.
|
jonasnick
force-pushed
the
nixos-tor-hiddenservice-version
branch
from
3c5afa9
to
1f3cf2f
Compare
|
Good catch. I fixed that. Actually I found the construction in rippled.nix and then didn't think about it. |
infinisil
requested changes
Nov 23, 2018
| version = mkOption { | ||
| default = null; | ||
| description = "Rendezvous service descriptor version to publish for the hidden service. Currently, versions 2 and 3 are supported. (Default: 2)"; | ||
| type = types.nullOr (types.addCheck types.int (x: x == 2 || x == 3)); |
There was a problem hiding this comment.
Another type revision:
types.nullOr (types.enum [ 2 3 ])There was a problem hiding this comment.
Makes sense. Done.
jonasnick
force-pushed
the
nixos-tor-hiddenservice-version
branch
from
1f3cf2f
to
5640aa2
Compare
infinisil
approved these changes
Nov 23, 2018
|
LGTM.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Allows to easily use v3 Hidden Services which "features many improvements over the legacy system". Due to the torrc syntax that seems difficult to do without adding a hidden service version option to the module.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)