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/nginx: Enable TLS 1.3 support #56233

Merged
merged 2 commits into from Mar 3, 2019
Merged

nixos/nginx: Enable TLS 1.3 support #56233

merged 2 commits into from Mar 3, 2019

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Feb 23, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar jtojnar added this to the 19.03 milestone Feb 23, 2019
@jtojnar
nginx: build with openssl 1.1
051e852 
This will allow us to enable TLSv1.3
thoughtpolice
thoughtpolice reviewed Feb 23, 2019
View reviewed changes
nixos/doc/manual/release-notes/rl-1903.xml Outdated
@@ -645,6 +645,9 @@
This may break some older applications that still rely on those symbols.
An upgrade guide can be found <link xlink:href="https://www.open-mpi.org/faq/?category=mpi-removed">here</link>.
</para>
<para>
The nginx now relies on OpenSSL 1.1 and supports TLS 1.3 by default. You can change the supported protocols using <xref linkend="opt-services.nginx.sslProtocols"/>
Copy link
Member

Choose a reason for hiding this comment

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

Wordsmithing: "The nginx package now requires OpenSSL, and supports TLS 1.3 by default."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It always required OpenSSL, we just switched from 1.0 to 1.1 branch.

Copy link
Member

Choose a reason for hiding this comment

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

I was more referring to the lack of the word "package" to qualify "nginx" to help it read easier, and placing emphasis on the "requirement" part. Yes, the full text should be:

The nginx package now requires OpenSSL 1.1, and supports TLS 1.3 by default.

@dtzWill
Copy link
Member

dtzWill commented Feb 24, 2019

LGTM, test deployed to a server and works as expected! Thanks! :)

@lheckemann
Copy link
Member

I've taken the liberty of rephrasing the release notes documentation myself so we can get this in today before the branch-off. A quick review would be appreciated!

@jtojnar
Copy link
Contributor Author

jtojnar commented Feb 25, 2019

Do not see any changes https://github.com/NixOS/nixpkgs/compare/3cedb8cbbf46b61bdfb9b0d138661c61eb057307..b3fbb0498a5a36c3e8082b4e73fc279acbde849a

@lheckemann
Copy link
Member

Argh, my mistake. New attempt here.

andir
andir approved these changes Mar 3, 2019
View reviewed changes
Copy link
Member

@andir andir left a comment

Choose a reason for hiding this comment

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

Looks good to me. The rephrasing also seems good.

@andir andir merged commit 768336a into NixOS:master Mar 3, 2019
@andir
Copy link
Member

andir commented Mar 3, 2019

@lheckemann can you (back)port this to release-19.03?

lheckemann pushed a commit that referenced this pull request Mar 4, 2019
@jtojnar @lheckemann
nixos/nginx: Enable TLS 1.3 support
bdbf631 
(cherry picked from commit f93ff28)
PR #56233
@lheckemann
Copy link
Member

Done! Thanks for the pointer.

@herrwiese
Copy link
Contributor

Uhm… did commit 051e852 (actually build nginx with openssl_1_1) just fall under the table in the release-19.03 channel? »You're not going to space^W^W^Wenabling TLS 1.3 today« ;)

@jtojnar jtojnar deleted the nginx-tlsv13 branch March 4, 2019 15:32
lheckemann pushed a commit that referenced this pull request Mar 4, 2019
@jtojnar @lheckemann
nginx: build with openssl 1.1
80d288f 
This will allow us to enable TLSv1.3

(cherry picked from commit 051e852)
PR #56233
@lheckemann
Copy link
Member

😨 oops. Good catch, fixed!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thoughtpolice thoughtpolice thoughtpolice left review comments

@bachp bachp bachp approved these changes

@andir andir andir approved these changes

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: nixos 8.has: changelog 8.has: documentation 8.has: module (update) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
19.03
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@jtojnar @dtzWill @lheckemann @andir @herrwiese @thoughtpolice @bachp @GrahamcOfBorg