Skip to content

nixos/nginx: revert config validation#209075

Merged
RaitoBezarius merged 3 commits intoNixOS:masterfrom
symphorien:nginx-validate-config-revert
Jan 22, 2023
Merged

nixos/nginx: revert config validation#209075
RaitoBezarius merged 3 commits intoNixOS:masterfrom
symphorien:nginx-validate-config-revert

Conversation

@symphorien
Copy link
Member

@symphorien symphorien commented Jan 4, 2023

Description of changes

Revert of #205561 (and #207532)

It is currently too fragile. We can workaround the weaknesses we know about (proposed in #207413 ) but I'm hesitated to go this way because it's arguably hacky. If we don't agree that we should go with #207413 by, say, the end of the month, let's just give up and revert.

cc nginx maintainers @thoughtpolice @fpletz @globin @ajs124 @7c6f434c

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: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 4, 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 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 4, 2023
@RaitoBezarius
Copy link
Member

RaitoBezarius commented Jan 14, 2023

@symphorien Can you fix the merge conflicts please?

@symphorien
Revert "nixos/nginx: disable configuration validation for now"
ecb0639 
This reverts commit 7ef58bc.
@symphorien
Revert "nixos: add release notes for nginx config validation"
aa47800 
This reverts commit 26a411b.
@symphorien
Revert "nixos/nginx: validate syntax of config file at build time"
cb73862 
This reverts commit a768871.

This is too fragile, it breaks at least on:
* ssl dh params
* hostnames in proxypass and upstreams are resolved in the sandbox
@symphorien symphorien force-pushed the nginx-validate-config-revert branch from da6edeb to cb73862 Compare January 20, 2023 19:42
@symphorien
Copy link
Member Author

symphorien commented Jan 20, 2023

done

@RaitoBezarius RaitoBezarius merged commit 04bf821 into NixOS:master Jan 22, 2023
@symphorien symphorien mentioned this pull request Feb 11, 2023
Closed
13 tasks
@gepbird gepbird mentioned this pull request Dec 29, 2025
Open
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RaitoBezarius RaitoBezarius RaitoBezarius approved these changes

@delroth delroth Awaiting requested review from delroth

@Mic92 Mic92 Awaiting requested review from Mic92

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 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 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@symphorien @RaitoBezarius