nixos/tor: add tor hidden service options #28081
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
This change allows to configure hidden services more conveniently.
fpletz
approved these changes
Aug 11, 2017
| mkHiddenServicePort = hsport: let | ||
| trgt = if (hsport.target != null) then | ||
| " " + hsport.target | ||
| else ""; |
There was a problem hiding this comment.
This could be simplified like:
trgt = optionalString (hsport.target != null) (" " + hsport.target)
There was a problem hiding this comment.
The following wins the golfing challenge:
trgt = '' ${hsport . target or ""}''
| description = '' | ||
| Configure hidden services. | ||
|
|
||
| Please consult the tor manual (<literal>man tor</literal>) for a more |
There was a problem hiding this comment.
This is rendered with docbook, so for referencing manpages you could use:
<citerefentry><refentrytitle>tor</refentrytitle><manvolnum>1</manvolnum></citerefentry>
Also use more elegant optionalString for optional strings.
|
This should do. I applied the docbook syntax to the previously existing documentation as well. |
a path below /var/lib/tor is usually used for hidden services
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
Having to configure tor hidden services via the
extraConfigdid not look as nice in the configuration.This change allows to configure hidden services more conveniently.
Things done
Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.
Since all changes are only related to generating torrc files i tested it on my local machine.
I was able to generate valid torrc files and host hidden services using those.
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)