-
Notifications
You must be signed in to change notification settings - Fork 31
Update nginx to the latest and improve TLS cipher suite list. TASK-55769 #237
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| FROM nginx:1.23.3 | ||
| FROM nginx:1.30.0 | ||
|
|
||
| COPY conf/nginx.conf /etc/nginx/nginx.conf | ||
| COPY conf/ssl-params.conf /etc/nginx/ssl-params.conf | ||
|
|
||
| COPY certs/nginx.crt /etc/ssl/certs/nginx.crt | ||
| COPY certs/nginx.key /etc/ssl/private/nginx.key | ||
| COPY certs/dhparam.pem /etc/ssl/certs/dhparam.pem | ||
|
|
||
| CMD nginx -g "daemon off;" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,23 @@ | ||
| # from https://cipherli.st/ | ||
| # and https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html | ||
| # adapted from: | ||
| # generated 2026-05-04, Mozilla Guideline v6.0, nginx 1.30, OpenSSL 3.5.5, intermediate config, HSTS | ||
| # https://ssl-config.mozilla.org/#server=nginx&version=1.30&config=intermediate&openssl=3.5.5&hsts&guideline=6.0 | ||
|
|
||
| # intermediate configuration | ||
| ssl_protocols TLSv1.2 TLSv1.3; | ||
| ssl_ecdh_curve X25519MLKEM768:X25519:prime256v1:secp384r1; | ||
| ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305; | ||
| ssl_prefer_server_ciphers off; | ||
|
|
||
| # see also ssl_session_ticket_key alternative to stateful session cache | ||
| ssl_session_timeout 1d; | ||
| ssl_session_cache shared:MozSSL:10m; # about 40000 sessions | ||
|
|
||
| ssl_protocols TLSv1 TLSv1.1 TLSv1.2; | ||
| ssl_prefer_server_ciphers on; | ||
| ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; | ||
| ssl_ecdh_curve secp384r1; | ||
| ssl_session_cache shared:SSL:10m; | ||
| ssl_session_tickets off; | ||
| ssl_stapling on; | ||
| ssl_stapling_verify on; | ||
| resolver 8.8.8.8 8.8.4.4 valid=300s; | ||
|
madirey marked this conversation as resolved.
Outdated
|
||
| resolver_timeout 5s; | ||
|
|
||
| # Disable preloading HSTS for now. You can use the commented out header line that includes | ||
| # the "preload" directive if you understand the implications. | ||
| #add_header Strict-Transport-Security "max-age=63072000; includeSubdomains; preload"; | ||
| add_header Strict-Transport-Security "max-age=63072000; includeSubdomains"; | ||
| add_header X-Frame-Options DENY; | ||
| add_header X-Content-Type-Options nosniff; | ||
|
|
||
| ssl_dhparam /etc/ssl/certs/dhparam.pem; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM nginx:1.23.3 | ||
| FROM nginx:1.30.0 | ||
|
|
||
| RUN apt-get update && apt-get install -y \ | ||
| wget \ | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The rest of these need to be renumbered (it's "1, 3, 4, 5, ..." currently).