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

nixos/hickory-dns: make settings.zone freeform; expose configFile option #363001

Merged
merged 2 commits into from
Dec 14, 2024

Conversation

uninsane
Copy link
Contributor

@uninsane uninsane commented Dec 8, 2024

in response to #362891

  • settings itself is freeform; that settings.zone is not was a mistake. everything in settings is handled by hickory-dns and the user should be free to specify options not known to nixos.
  • exposing configFile gives users a way to configure hickory-dns outside of nixos, e.g. to deploy the example configs from hickory-dns, or as an escape hatch should the nixos module contain other bugs.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

like the toplevel hickory-dns.settings, options here are handled by the
hickory-dns binary: users should be able to specify options that the
nixos module has overlooked.
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 8, 2024
@uninsane uninsane marked this pull request as draft December 8, 2024 01:12
@uninsane uninsane marked this pull request as ready for review December 8, 2024 01:15
this allows users the option to configure hickory-dns manually,
for example from the .toml files specified in hickory-dns examples
directory.
@uninsane uninsane force-pushed the pr-hickory-dns-improvements branch from 7da1cb7 to 9117dd6 Compare December 8, 2024 22:59
@misuzu misuzu merged commit 382e7cb into NixOS:master Dec 14, 2024
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants