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

Merge pull request #78392 from Mic92/kresd-doh #78392

Merged
merged 2 commits into from Jan 24, 2020
Merged

Merge pull request #78392 from Mic92/kresd-doh #78392

merged 2 commits into from Jan 24, 2020

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Jan 23, 2020 •
edited

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Mic92
nixos/knot: set defaultText for package option
bfa278e 
the package attributes looks nicer in the manual
@Mic92 Mic92 requested a review from vcunat January 23, 2020 23:18
@Mic92
Copy link
Member Author

Mic92 commented Jan 23, 2020

Tested with Mic92/dotfiles@0737288

vcunat
vcunat approved these changes Jan 24, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Seems good. As you noticed, the socket units are going away soon, so the implementation will need to change anyway – but adding another "socket kind" doesn't make a significant difference to the transition.

@andir: we talked about DoH, but I expect you don't object adding this (in principle).

Even Windows announced DoH plans (Chrome-style auto-upgrade for now, with DoT perhaps later), so I understand many will need to plan providing a DoH service.

@Mic92
Copy link
Member Author

Mic92 commented Jan 24, 2020

When systemd-socket support is dropped this can be converted to use the configuration file instead without breaking compatibility.

@Mic92 Mic92 changed the title knot-resolver: add doh support Merge pull request #78392 from Mic92/kresd-doh Jan 24, 2020
@Mic92 Mic92 merged commit 40e51d2 into NixOS:master Jan 24, 2020
@Mic92 Mic92 deleted the kresd-doh branch January 24, 2020 10:31
@vcunat
Copy link
Member

vcunat commented Jan 24, 2020

Yes, that was my plan.

@vcunat
Copy link
Member

vcunat commented Jan 27, 2020

For the sockets see PR #78628.

vcunat added a commit to vcunat/nixpkgs that referenced this pull request Feb 26, 2020
@vcunat
nixos/kresd: never force extraFeatures = false
5f88120 
Fixes NixOS#81109.  Regressed in PR NixOS#78392 (2685806).
@vcunat vcunat mentioned this pull request Feb 26, 2020
Merged
@vcunat
Copy link
Member

vcunat commented Nov 12, 2020

.listenDoH is now being switched to new implementation: #103633

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@Mic92 @vcunat