update
This commit is contained in:
Jun Kurihara
parent
fd4425afb4
commit
fc296a4d01
5 changed files with 101 additions and 80 deletions
|
|
@ -18,11 +18,17 @@ echo "Benchmark on rpxy"
|
|||
#wrk -t8 -c100 -d30s http://127.0.0.1:8080/index.html
|
||||
rewrk -c 256 -t 4 -d 10s -h http://localhost:8080 --pct
|
||||
|
||||
echo "sleep 3 secs"
|
||||
sleep 3
|
||||
|
||||
echo "----------------------------"
|
||||
echo "Benchmark on nginx"
|
||||
# wrk -t8 -c100 -d30s http://127.0.0.1:8090/index.html
|
||||
rewrk -c 256 -t 4 -d 10s -h http://localhost:8090 --pct
|
||||
|
||||
echo "sleep 3 secs"
|
||||
sleep 3
|
||||
|
||||
echo "----------------------------"
|
||||
echo "Benchmark on caddy"
|
||||
# wrk -t8 -c100 -d30s http://127.0.0.1:8100/index.html
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ services:
|
|||
rpxy-rp:
|
||||
image: jqtype/rpxy
|
||||
container_name: proxy-rpxy
|
||||
pull_policy: never
|
||||
build:
|
||||
context: ../
|
||||
restart: unless-stopped
|
||||
|
|
@ -45,8 +46,8 @@ services:
|
|||
tty: false
|
||||
privileged: true
|
||||
volumes:
|
||||
- ./nginx_data/vhost:/etc/nginx/vhost.d
|
||||
- ./nginx_data/conf:/etc/nginx/conf.d/
|
||||
- ./nginx_data/vhost:/etc/nginx/vhost.d:ro
|
||||
- ./nginx_data/conf:/etc/nginx/conf.d/:ro
|
||||
- /var/run/docker.sock:/tmp/docker.sock:ro
|
||||
logging:
|
||||
options:
|
||||
|
|
|
|||
|
|
@ -1,63 +1,63 @@
|
|||
# nginx-proxy version : 1.0.1-6-gc4ad18f
|
||||
# If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the
|
||||
# scheme used to connect to this server
|
||||
map $http_x_forwarded_proto $proxy_x_forwarded_proto {
|
||||
default $http_x_forwarded_proto;
|
||||
'' $scheme;
|
||||
}
|
||||
# If we receive X-Forwarded-Port, pass it through; otherwise, pass along the
|
||||
# server port the client connected to
|
||||
map $http_x_forwarded_port $proxy_x_forwarded_port {
|
||||
default $http_x_forwarded_port;
|
||||
'' $server_port;
|
||||
}
|
||||
# If we receive Upgrade, set Connection to "upgrade"; otherwise, delete any
|
||||
# Connection header that may have been passed to this server
|
||||
map $http_upgrade $proxy_connection {
|
||||
default upgrade;
|
||||
'' close;
|
||||
}
|
||||
# Apply fix for very long server names
|
||||
server_names_hash_bucket_size 128;
|
||||
# Default dhparam
|
||||
ssl_dhparam /etc/nginx/dhparam/dhparam.pem;
|
||||
# Set appropriate X-Forwarded-Ssl header based on $proxy_x_forwarded_proto
|
||||
map $proxy_x_forwarded_proto $proxy_x_forwarded_ssl {
|
||||
default off;
|
||||
https on;
|
||||
}
|
||||
gzip_types text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
|
||||
log_format vhost '$host $remote_addr - $remote_user [$time_local] '
|
||||
'"$request" $status $body_bytes_sent '
|
||||
'"$http_referer" "$http_user_agent" '
|
||||
'"$upstream_addr"';
|
||||
access_log off;
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
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:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384';
|
||||
ssl_prefer_server_ciphers off;
|
||||
error_log /dev/stderr;
|
||||
resolver 127.0.0.11;
|
||||
# HTTP 1.1 support
|
||||
proxy_http_version 1.1;
|
||||
proxy_buffering off;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $proxy_connection;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
|
||||
proxy_set_header X-Forwarded-Ssl $proxy_x_forwarded_ssl;
|
||||
proxy_set_header X-Forwarded-Port $proxy_x_forwarded_port;
|
||||
proxy_set_header X-Original-URI $request_uri;
|
||||
# # nginx-proxy version : 1.0.1-6-gc4ad18f
|
||||
# # If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the
|
||||
# # scheme used to connect to this server
|
||||
# map $http_x_forwarded_proto $proxy_x_forwarded_proto {
|
||||
# default $http_x_forwarded_proto;
|
||||
# '' $scheme;
|
||||
# }
|
||||
# # If we receive X-Forwarded-Port, pass it through; otherwise, pass along the
|
||||
# # server port the client connected to
|
||||
# map $http_x_forwarded_port $proxy_x_forwarded_port {
|
||||
# default $http_x_forwarded_port;
|
||||
# '' $server_port;
|
||||
# }
|
||||
# # If we receive Upgrade, set Connection to "upgrade"; otherwise, delete any
|
||||
# # Connection header that may have been passed to this server
|
||||
# map $http_upgrade $proxy_connection {
|
||||
# default upgrade;
|
||||
# '' close;
|
||||
# }
|
||||
# # Apply fix for very long server names
|
||||
# server_names_hash_bucket_size 128;
|
||||
# # Default dhparam
|
||||
# ssl_dhparam /etc/nginx/dhparam/dhparam.pem;
|
||||
# # Set appropriate X-Forwarded-Ssl header based on $proxy_x_forwarded_proto
|
||||
# map $proxy_x_forwarded_proto $proxy_x_forwarded_ssl {
|
||||
# default off;
|
||||
# https on;
|
||||
# }
|
||||
# gzip_types text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
|
||||
# log_format vhost '$host $remote_addr - $remote_user [$time_local] '
|
||||
# '"$request" $status $body_bytes_sent '
|
||||
# '"$http_referer" "$http_user_agent" '
|
||||
# '"$upstream_addr"';
|
||||
# access_log off;
|
||||
# ssl_protocols TLSv1.2 TLSv1.3;
|
||||
# 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:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384';
|
||||
# ssl_prefer_server_ciphers off;
|
||||
# error_log /dev/stderr;
|
||||
# resolver 127.0.0.11;
|
||||
# # HTTP 1.1 support
|
||||
# proxy_http_version 1.1;
|
||||
# proxy_buffering off;
|
||||
# proxy_set_header Host $http_host;
|
||||
# proxy_set_header Upgrade $http_upgrade;
|
||||
# proxy_set_header Connection $proxy_connection;
|
||||
# proxy_set_header X-Real-IP $remote_addr;
|
||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
# proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
|
||||
# proxy_set_header X-Forwarded-Ssl $proxy_x_forwarded_ssl;
|
||||
# proxy_set_header X-Forwarded-Port $proxy_x_forwarded_port;
|
||||
# proxy_set_header X-Original-URI $request_uri;
|
||||
# Mitigate httpoxy attack (see README for details)
|
||||
proxy_set_header Proxy "";
|
||||
server {
|
||||
server_name _; # This is just an invalid value which will never trigger on a real hostname.
|
||||
server_tokens off;
|
||||
listen 80;
|
||||
access_log /var/log/nginx/access.log vhost;
|
||||
return 503;
|
||||
}
|
||||
# proxy_set_header Proxy "";
|
||||
# server {
|
||||
# server_name _; # This is just an invalid value which will never trigger on a real hostname.
|
||||
# server_tokens off;
|
||||
# listen 80;
|
||||
# # access_log /var/log/nginx/access.log vhost;
|
||||
# return 503;
|
||||
# }
|
||||
# localhost
|
||||
upstream localhost {
|
||||
## Can be connected with "bench-nw" network
|
||||
|
|
@ -67,7 +67,7 @@ upstream localhost {
|
|||
server {
|
||||
server_name localhost;
|
||||
listen 80 ;
|
||||
access_log /var/log/nginx/access.log vhost;
|
||||
# access_log /var/log/nginx/access.log vhost;
|
||||
location / {
|
||||
proxy_pass http://localhost;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue