Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zerotier: added option to customise the port used #42469

Merged
merged 1 commit into from Aug 8, 2018
Merged

zerotier: added option to customise the port used #42469

merged 1 commit into from Aug 8, 2018

Conversation

ghuntley
Copy link
Member

Motivation for this change

Allow folks the ability to change which port zerotier uses. Useful for NAT hole punching.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

infinisil
infinisil requested changes Jun 24, 2018
View reviewed changes
nixos/modules/services/networking/zerotierone.nix
@@ -17,6 +17,15 @@ in
'';
};

options.services.zerotierone.port = mkOption {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a refactor of these 4 options under options.services.zerotierone would be nice, other than that this looks good to me.

jb55
jb55 approved these changes Jun 27, 2018
View reviewed changes
Copy link
Contributor

@jb55 jb55 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@infinisil
Copy link
Member

Can you change the commit message to use the nixos/zerotier prefix? I can then merge it.

@ghuntley
Copy link
Member Author

ghuntley commented Aug 8, 2018

Done!

@infinisil infinisil merged commit 5654793 into NixOS:master Aug 8, 2018
@ghuntley ghuntley deleted the patch-4 branch August 8, 2018 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil requested changes

@jb55 jb55 jb55 approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ghuntley @infinisil @jb55 @GrahamcOfBorg