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

Jump to bottom

nixos/httpd: respect hostName when provisioning certificates #96923

Closed
wants to merge 1 commit into from
Closed

nixos/httpd: respect hostName when provisioning certificates #96923

wants to merge 1 commit into from

Conversation

mohe2015
Copy link
Contributor

@mohe2015 mohe2015 commented Sep 1, 2020 •
edited

Motivation for this change

This fixes an inconsistency when the attribute name doesn't match the hostName.
See #96910 (comment)
@aanderse

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.

@aanderse aanderse requested a review from a team September 1, 2020 22:18
@aanderse
Copy link
Member

aanderse commented Sep 1, 2020

ping @arianvp I haven't looked but does nginx suffer the same problem here?

@aanderse
Copy link
Member

aanderse commented Sep 1, 2020

@mohe2015 please follow CONTRIBUTING.md for the commit message: nixos/httpd: respect hostName when provisioning certificates, or something like that.

@mohe2015
Copy link
Contributor Author

mohe2015 commented Sep 2, 2020

@mohe2015 please follow CONTRIBUTING.md for the commit message: nixos/httpd: respect hostName when provisioning certificates, or something like that.

Done. Hope this is fine now.

@aanderse aanderse changed the title Bugfix in apache httpd nixos/httpd: respect hostName when provisioning certificates Sep 2, 2020
@aanderse
Copy link
Member

aanderse commented Sep 2, 2020

@mohe2015 great! Thanks!

@mohe2015
Copy link
Contributor Author

mohe2015 commented Sep 2, 2020 •
edited

https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-servers/nginx/default.nix#L775 and https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/web-servers/nginx/default.nix#L12 - nginx seems fine.

@mohe2015
Copy link
Contributor Author

mohe2015 commented Sep 3, 2020

Maybe don't merge in favor of #91121?

@aanderse
Copy link
Member

aanderse commented Sep 3, 2020

@mohe2015 sorry, this is obviously on me. I was aware of that PR, but missed the certificates part... Sorry 🙇 How about we leave this open until #91121 is merged?

@m1cr0man
Copy link
Contributor

m1cr0man commented Sep 3, 2020

I'm not pushed honestly. If this is merged I can do a rebase in #91121 this evening.

@mohe2015
Copy link
Contributor Author

mohe2015 commented Sep 3, 2020

It's up to you people - the change in https://github.com/NixOS/nixpkgs/pull/91121/files#diff-67cf2394795df903410ca0d6de1fa388R658 is a little bit different but I don't know what's the actual difference. I just don't want to prevent getting #91121 merged quickly. But it seems like it may not make it into 20.09 so getting this in may be benefical.

@m1cr0man
Copy link
Contributor

m1cr0man commented Sep 3, 2020

It's up to you people - the change in https://github.com/NixOS/nixpkgs/pull/91121/files#diff-67cf2394795df903410ca0d6de1fa388R658 is a little bit different but I don't know what's the actual difference. I just don't want to prevent getting #91121 merged quickly. But it seems like it may not make it into 20.09 so getting this in may be benefical.

I looked at this a day ago and I think the only difference is that I used builtins.map instead of mapAttrs', as to match the nginx code. The functionality is the same.

@mohe2015 mohe2015 closed this Sep 6, 2020
@mohe2015
Copy link
Contributor Author

mohe2015 commented Sep 6, 2020 •
edited

Congrats for getting the other PR merged!

@m1cr0man
Copy link
Contributor

m1cr0man commented Sep 7, 2020 via email

@mohe2015 mohe2015 deleted the fix-apache2-acme-hostname branch September 10, 2020 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mohe2015 @aanderse @m1cr0man