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.

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

NetworkManager nixos: add noDns option #39921

Merged
merged 1 commit into from May 8, 2018
Merged

Conversation

jD91mZM2
Copy link
Member

@jD91mZM2 jD91mZM2 commented May 3, 2018

No touchy tha DNS!
Would it be better to add a general dns enum?

@peterhoeg
Copy link
Member

Being able to set conflicting options like noDns and useDnsmasq isn't great. One option could be to an enum as you suggest with a system option that applies the logic currently in place for systemd-resolved and unbound. The alternative is to get rid of the automatic detection and turn the dependency upside down so that setting dns to systemd-resolved automatically enabled it.

@jD91mZM2
Copy link
Member Author

jD91mZM2 commented May 7, 2018

Maybe the automatic detection could enabled only if dns is null?

@peterhoeg
Copy link
Member

That doesn't seem intuitive. How about an auto option which is the default?

@jD91mZM2
Copy link
Member Author

jD91mZM2 commented May 7, 2018

Even better! I'll get to work! Do I keep but deprecate the old useDnsmasq option?

@jD91mZM2 jD91mZM2 force-pushed the nodns branch 2 times, most recently from 6084ed8 to d52d1fc Compare May 7, 2018 06:13
@peterhoeg
Copy link
Member

You can deprecate by adding it here: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/rename.nix and then removing it accordingly.

When deprecating an option please also add a notice to the release notes.

@jD91mZM2 jD91mZM2 force-pushed the nodns branch 2 times, most recently from e0bf7b6 to a85b861 Compare May 7, 2018 08:01
@jD91mZM2
Copy link
Member Author

jD91mZM2 commented May 7, 2018

Aha, thanks!

type = types.bool;
default = false;
dns = mkOption {
type = types.enum ["auto" "dnsmasq" "none"];
Copy link
Member

Choose a reason for hiding this comment

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

nitpick - can you add spaces inside the list [ "auto" "dnsmasq" "none" ]

@peterhoeg
Copy link
Member

And if you can fix the merge conflict, I'll go ahead and merge this.

@jD91mZM2
Copy link
Member Author

jD91mZM2 commented May 8, 2018

@peterhoeg Awesome, thanks! Rebased :)

@peterhoeg peterhoeg changed the title NetworkManager: add noDns option NetworkManager nixos: add noDns option May 8, 2018
@peterhoeg peterhoeg merged commit db920b5 into NixOS:master May 8, 2018
@peterhoeg
Copy link
Member

Thank you for doing up the PR and the quick turnaround time!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants