-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
Conversation
e2ea436
to
6180999
Compare
6180999
to
91a6455
Compare
91a6455
to
87f686d
Compare
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? |
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 |
It is possible, but its a bit opaque by passing it to the Otherwise I am happy with getting them in as long as we also get it in |
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! |
87f686d
to
4eaedd5
Compare
db6c76b
to
78e157b
Compare
78e157b
to
53fd903
Compare
53fd903
to
64f14be
Compare
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
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes