Skip to content

Commit

Permalink
Make marginal updates to NGINX benchmark based on https://armkeil.blo…
Browse files Browse the repository at this point in the history
  • Loading branch information
andyz422 authored and copybara-github committed Nov 13, 2024
1 parent 494d492 commit 3819274
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
5 changes: 2 additions & 3 deletions perfkitbenchmarker/data/nginx/file_server.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# HTTPS file server based on https://docs.nginx.com/nginx/admin-guide/web-server/serving-static-content/
# HTTPS file server based on https://armkeil.blob.core.windows.net/developer/Files/pdf/white-paper/guidelines-for-deploying-nginx-plus-on-aws.pdf.
server {
listen 443 ssl reuseport backlog=65535;
root /usr/share/nginx/html;
index index.html index.htm;
server_name $hostname;

open_file_cache max=1000;

ssl on;
ssl_certificate /etc/nginx/ssl/ecdsa.crt;
ssl_certificate_key /etc/nginx/ssl/ecdsa.key;
ssl_ciphers ECDHE-ECDSA-AES256-GCM-SHA384;
Expand Down
5 changes: 3 additions & 2 deletions perfkitbenchmarker/data/nginx/rp_apigw.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Reverse Proxy and API Gateway based on https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/
# Reverse Proxy and API Gateway based on https://armkeil.blob.core.windows.net/developer/Files/pdf/white-paper/guidelines-for-deploying-nginx-plus-on-aws.pdf.
# Upstreams for https
# Do not modify commented code; it is used by nginx_benchmark.py.
upstream ssl_file_server_com {
Expand All @@ -22,9 +22,10 @@ server {
index index.html index.htm;
server_name $hostname;

ssl on;
ssl_certificate /etc/nginx/ssl/ecdsa.crt;
ssl_certificate_key /etc/nginx/ssl/ecdsa.key;
ssl_ciphers ECDHE-ECDSA-AES256-GCM-SHA384;
ssl_ciphers "ECDHE-ECDSA-AES256-GCM-SHA384";

# API Gateway Path
location ~ ^/api_old/.*$ {
Expand Down
2 changes: 1 addition & 1 deletion perfkitbenchmarker/linux_benchmarks/nginx_benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def _TuneNetworkStack(vm):
"""Tune the network stack to improve throughput.
These settings are based on the recommendations in
https://learn.arm.com/learning-paths/servers-and-cloud-computing/nginx_tune.
https://armkeil.blob.core.windows.net/developer/Files/pdf/white-paper/guidelines-for-deploying-nginx-plus-on-aws.pdf.
Args:
vm: The VM to tune.
Expand Down

0 comments on commit 3819274

Please sign in to comment.