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

[22.11] nixos/headscale: Update openidconnect options to be in sync with package #215438

Closed
wants to merge 1 commit into from

Conversation

dali99
Copy link
Member

@dali99 dali99 commented Feb 9, 2023

Description of changes

Updated openIdConnect options to match the config options available in the version actually used on 22.11

I've also hidden the option that isn't applicable anymore so people won't be confused when looking at the available options in the man page

This is only a problem for 22.11 as on master #203938 was merged

On a related note:

I think it headscale might fit the bill for something that can be backported even with breaking changes - since it relies heavily on external infrastructure and client applications, but maintaining two separate modules like this would be a pain.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@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 Feb 9, 2023
@dali99 dali99 changed the title nixos/headscale: Update openidconnect options to be in sync with package [22.111] nixos/headscale: Update openidconnect options to be in sync with package Feb 9, 2023
@dali99 dali99 changed the title [22.111] nixos/headscale: Update openidconnect options to be in sync with package [22.11] nixos/headscale: Update openidconnect options to be in sync with package Feb 9, 2023
@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 Feb 9, 2023
@dali99 dali99 force-pushed the 22.11-headscale-module branch from e2ea436 to 6180999 Compare February 15, 2023 04:55
@dali99 dali99 force-pushed the 22.11-headscale-module branch from 6180999 to 91a6455 Compare February 25, 2023 01:56
@dali99 dali99 marked this pull request as ready for review February 25, 2023 03:01
@dali99 dali99 requested a review from kradalby February 25, 2023 03:01
@dali99 dali99 force-pushed the 22.11-headscale-module branch from 91a6455 to 87f686d Compare February 27, 2023 08:00
@kradalby
Copy link
Member

Hi, great to add the ones I've missed earlier.

The module went through a large rewrite in 5717803 which makes the config format conform with RFC0042, These options are still missing on master, so would be great to get them in there: https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/headscale.nix#L276-L313.

As for 22.11, I am not actually sure what the process is to get it backported, maybe we should start with getting these into master, then look at the backporting?

@dali99
Copy link
Member Author

dali99 commented Feb 27, 2023

I'd say we should merge this first, so that it's at all possible to configure oidc on 22.11, then we can open a discussion about backporting the module from master later. (I don't think we generally do this, my original comment was only talking about backporting the package updates)

As for adding these options to the module on master, I'll file a PR for it, but it's orthogonal to this PR, and is not a pressing concern since it's a freeform module

@kradalby
Copy link
Member

so that it's at all possible to configure oidc on 22.11

It is possible, but its a bit opaque by passing it to the services.headscale.settings.

Otherwise I am happy with getting them in as long as we also get it in master.

@dali99
Copy link
Member Author

dali99 commented Feb 27, 2023

oh, you're right of course, I read "Overrides to config.yaml" as "Overrides config.yaml", coupled with the PR on master that changed settings into a freeform module, and didn't look into it any further. My bad!

@dali99 dali99 mentioned this pull request Feb 27, 2023
12 tasks
@figsoda figsoda added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 5, 2023
@dali99 dali99 force-pushed the 22.11-headscale-module branch from 87f686d to 4eaedd5 Compare March 14, 2023 05:32
@dali99 dali99 added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package label Mar 15, 2023
@dali99 dali99 force-pushed the 22.11-headscale-module branch 2 times, most recently from db6c76b to 78e157b Compare April 5, 2023 15:31
@dali99 dali99 force-pushed the 22.11-headscale-module branch from 78e157b to 53fd903 Compare April 11, 2023 16:26
@dali99 dali99 force-pushed the 22.11-headscale-module branch from 53fd903 to 64f14be Compare April 13, 2023 23:13
@dali99 dali99 closed this Jun 1, 2023
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 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants