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

nginxModules.ModSecurity-beta: 2017-06-17 -> 2017-08-23 #32449

Merged
merged 1 commit into from Dec 17, 2017

Conversation

Izorkin
Copy link
Contributor

@Izorkin Izorkin commented Dec 8, 2017

Motivation for this change

Update nginx modules ModSecurity-beta to recent version

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@@ -47,12 +47,12 @@
'';
};

modsecurity-beta = {
modsecurity-nginx = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the stable version above is called modsecurity. Renaming this one to modsecurity-nginx will lead to confusion.

@Izorkin
Copy link
Contributor Author

Izorkin commented Dec 9, 2017

Fixed commit

rev = "abbf2c47f6f3205484a1a9db618e067dce213b89";
sha256 = "04ar51bnqjca6g4p2irymgdmc8rh5nsi8ml43srm4krllnkvw8qn";
rev = "a2a5858d249222938c2f5e48087a922c63d7f9d8";
sha256 = "1zj0fq35hddzf7b3x40xlbss866lg7w2vd1bbm8g1hcq1ny2s84n";
};
inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ];
Copy link
Member

@Mic92 Mic92 Dec 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no libmodsecurity package. Is modsecurity_standalone wanted here instead?
How did you test this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need this PR - #32075

@joachifm
Copy link
Contributor

I wonder, why bump the revision? Not saying we shouldn't but it's not clear why one revision would be better than another, so it'd be nice to have that noted in the commit message.

@Izorkin Izorkin changed the title ModSecurity-nginx: update revision ModSecurity-nginx: update version to 2017-08-23 Dec 12, 2017
@Izorkin Izorkin changed the title ModSecurity-nginx: update version to 2017-08-23 nginxModules.ModSecurity-nginx: 2017-06-17 -> 2017-08-23 Dec 12, 2017
@Izorkin Izorkin changed the title nginxModules.ModSecurity-nginx: 2017-06-17 -> 2017-08-23 nginxModules.ModSecurity-beta: 2017-06-17 -> 2017-08-23 Dec 12, 2017
@Mic92 Mic92 merged commit bc97af0 into NixOS:master Dec 17, 2017
@Izorkin Izorkin deleted the ModSecurity-nginx branch December 17, 2017 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants