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

openresty: make compatible with nixos nginx module #89342

Merged
merged 2 commits into from Jun 20, 2020
Merged

openresty: make compatible with nixos nginx module #89342

merged 2 commits into from Jun 20, 2020

Conversation

JJJollyjim
Copy link
Member

Motivation for this change

Openresty currently fails to start when provided to services.nginx, as it can't load fastcgi.conf.

This PR resolves that, and adds a test to ensure that all nginx variants in nixpkgs (or at least the ones I'm aware of...) can start and serve a simple request.

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.

@ofborg ofborg bot added the 6.topic: nixos label Jun 2, 2020
@ofborg ofborg bot requested review from lblasc, emilazy and thoughtpolice June 2, 2020 05:14
@JJJollyjim JJJollyjim mentioned this pull request Jun 2, 2020
Merged
10 tasks
@JJJollyjim
Copy link
Member Author

@ofborg test nginx-variants

@Izorkin
Copy link
Contributor

Izorkin commented Jun 2, 2020

Please add to this test check with tengine.

@JJJollyjim
Copy link
Member Author

@ofborg test nginx-variants

@Izorkin done 👍

@JJJollyjim
Copy link
Member Author

/marvin opt-in

@marvin-mk2 marvin-mk2 bot added the marvin label Jun 20, 2020
@marvin-mk2
Copy link

marvin-mk2 bot commented Jun 20, 2020

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@JJJollyjim
Copy link
Member Author

/status needs_review

@7c6f434c 7c6f434c merged commit 44007de into NixOS:master Jun 20, 2020
@marvin-mk2 marvin-mk2 bot requested a review from timokau July 3, 2020 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lblasc lblasc Awaiting requested review from lblasc

@emilazy emilazy Awaiting requested review from emilazy

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@timokau timokau Awaiting requested review from timokau

Assignees
No one assigned
Labels
6.topic: nixos 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 awaiting_reviewer marvin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@JJJollyjim @Izorkin @7c6f434c