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

openresty: make compatible with nixos nginx module #89342

Merged
merged 2 commits into from Jun 20, 2020

Conversation

@JJJollyjim
Copy link
Contributor

JJJollyjim commented Jun 2, 2020

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.
@JJJollyjim
Copy link
Contributor Author

JJJollyjim commented Jun 2, 2020

@ofborg test nginx-variants

@Izorkin
Copy link
Contributor

Izorkin commented Jun 2, 2020

Please add to this test check with tengine.

@JJJollyjim JJJollyjim force-pushed the JJJollyjim:test-all-nginx branch from 8165430 to 44007de Jun 2, 2020
@JJJollyjim
Copy link
Contributor Author

JJJollyjim commented Jun 2, 2020

@ofborg test nginx-variants

@Izorkin done 👍

@JJJollyjim
Copy link
Contributor Author

JJJollyjim commented Jun 20, 2020

/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
Contributor Author

JJJollyjim commented Jun 20, 2020

/status needs_review

@marvin-mk2 marvin-mk2 bot added the needs_reviewer label Jun 20, 2020
@7c6f434c 7c6f434c merged commit 44007de into NixOS:master Jun 20, 2020
18 checks passed
18 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="44007de"; rev="44007dec5c96dbfa3aa2aa5850a4c05804eae38e"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="44007de"; rev="44007dec5c96dbfa3aa2aa5850a4c05804eae38e"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="44007de"; rev="44007dec5c96dbfa3aa2aa5850a4c05804eae38e"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="44007de"; rev="44007dec5c96dbfa3aa2aa5850a4c05804eae38e"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="44007de"; rev="44007dec5c96dbfa3aa2aa5850a4c05804eae38e"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="44007de"; rev="44007dec5c96dbfa3aa2aa5850a4c05804eae38e"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="44007de"; rev="44007dec5c96dbfa3aa2aa5850a4c05804eae38e"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
openresty, openresty.passthru.tests on aarch64-linux Success
Details
openresty, openresty.passthru.tests on x86_64-linux Success
Details
tests.nginx-variants on aarch64-linux Success
Details
tests.nginx-variants on x86_64-linux Success
Details
@marvin-mk2 marvin-mk2 bot requested a review from timokau Jul 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.