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

nixos/wg-access-server: bugfix missing cfg dns.enabled #352839

Merged
merged 1 commit into from
Nov 27, 2024
Merged

nixos/wg-access-server: bugfix missing cfg dns.enabled #352839

merged 1 commit into from
Nov 27, 2024

Conversation

paepckehh
Copy link
Contributor

@paepckehh paepckehh commented Nov 1, 2024 •
edited
Loading

Seems to me a plain and simple typo.

   error: attribute 'enabled' missing
   at /nix/store/m68ikm8045fj7ys7qvgr608z9l70hh1k-source/nixos/modules/services/networking/wg-access-server.nix:107:29:
      106|             "CAP_NET_ADMIN"
      107|           ] ++ lib.optional cfg.settings.dns.enabled "CAP_NET_BIND_SERVICE";
         |                             ^
      108|         in
   Did you mean enable?

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@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/` labels Nov 1, 2024
@paepckehh paepckehh added the 0.kind: bug Something is broken label Nov 1, 2024
@paepckehh paepckehh requested review from xanderio and removed request for xanderio November 1, 2024 11:11
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 1, 2024
xanderio
xanderio requested changes Nov 1, 2024
View reviewed changes
nixos/modules/services/networking/wg-access-server.nix Outdated
@@ -104,7 +104,7 @@ in
let
capabilities = [
"CAP_NET_ADMIN"
] ++ lib.optional cfg.settings.dns.enabled "CAP_NET_BIND_SERVICE";
] ++ lib.optional cfg.settings.dns.enable "CAP_NET_BIND_SERVICE";
Copy link
Contributor

Choose a reason for hiding this comment

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

It is true that this is a typo, but the typo isn't here it's in line 21. As the settings.* options are RFC 42 style options, we mirror upstream config options. See https://www.freie-netze.org/wg-access-server/2-configuration/#:~:text=dns.enabled

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Pure technically, the RFC42 compliance is right here.
But this will make a lot of people trip. PR updated.

xanderio
xanderio approved these changes Nov 1, 2024
View reviewed changes
Copy link
Contributor

@xanderio xanderio left a comment

Choose a reason for hiding this comment

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

The enabled Option

@xanderio xanderio added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Nov 1, 2024
@paepckehh paepckehh changed the title nixos/wg-access-server: bugfix dns.enabled -> dns.enable nixos/wg-access-server: bugfix missing cfg dns.enabled Nov 1, 2024
@wegank wegank removed the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package label Nov 1, 2024
@xanderio xanderio added backport release-24.05 Backport PR automatically backport release-24.11 Backport PR automatically labels Nov 27, 2024
leona-ya
leona-ya approved these changes Nov 27, 2024
View reviewed changes
Copy link
Member

@leona-ya leona-ya left a comment

Choose a reason for hiding this comment

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

LGTM. Also mkRenamedOptionModule doesn't really make sense as it was broken before.

@leona-ya leona-ya merged commit 57decfd into NixOS:master Nov 27, 2024
34 checks passed
@github-actions GitHub Actions
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-352839-to-release-24.05 origin/release-24.05
cd .worktree/backport-352839-to-release-24.05
git switch --create backport-352839-to-release-24.05
git cherry-pick -x a58c8fee1e265904132803d4d4d8c1d9c56dee71

@github-actions GitHub Actions
Copy link
Contributor

Successfully created backport PR for release-24.11:

@github-actions github-actions bot mentioned this pull request Nov 27, 2024
Merged
1 task
@xanderio
Copy link
Contributor

Well of course we can backport this to 21.11, do to wg-access-server simply not being in that release ^^

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

@leona-ya leona-ya leona-ya approved these changes

@xanderio xanderio xanderio approved these changes

Assignees
No one assigned
Labels
0.kind: bug Something is broken 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 12.approvals: 1 This PR was reviewed and approved by one reputable person backport release-24.05 Backport PR automatically backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@paepckehh @xanderio @leona-ya @wegank